From 7abac54f0a1e4fda0a024a48eefb2ca626ad146c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 25 四月 2024 21:07:47 +0800
Subject: [PATCH] 修改了代码’ git commit -m 修改了代码’
---
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 137 ++++++++++++++++++++++++++++++++-------------
1 files changed, 96 insertions(+), 41 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
index 5eec8e2..9e669ec 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
@@ -22,6 +22,7 @@
import javax.annotation.Resource;
import java.io.IOException;
+import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -200,56 +201,103 @@
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
- if(meeting.getPlace()!=null){
- newModel.setBy1(meeting.getPlace());
+
+ if(meeting.getTitle()!=null){
+ newModel.setBy1(meeting.getTitle());
}else {
- newModel.setBy1(dataById.getPlace());
+ newModel.setBy1(dataById.getTitle());
+ }
+
+ if(meeting.getPlace()!=null){
+ newModel.setBy2(meeting.getPlace());
+ }else {
+ newModel.setBy2(dataById.getPlace());
+ }
+
+ if(StringUtils.isEmpty(String.valueOf(meeting.getConPeople()))){
+ newModel.setBy8(meeting.getConPeople());
+ }else {
+ newModel.setBy8(dataById.getConPeople());
+ }
+
+ if(StringUtils.isEmpty(String.valueOf(meeting.getPartPeople()))){
+ newModel.setBy9(meeting.getPartPeople());
+ }else {
+ newModel.setBy9(dataById.getPartPeople());
+ }
+
+
+ if(StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson()))){
+ newModel.setBy10(meeting.getApplyPerson());
+ }else {
+ newModel.setBy10(dataById.getApplyPerson());
}
if(meeting.getApplyApart()!=null){
- newModel.setBy2(meeting.getApplyApart());
+ newModel.setBy3(meeting.getApplyApart());
}else {
- newModel.setBy2(dataById.getApplyApart());
+ newModel.setBy3(dataById.getApplyApart());
}
- if(meeting.getTitle()!=null){
- newModel.setBy3(meeting.getTitle());
+ if(StringUtils.isEmpty(String.valueOf(meeting.getStartTime()))){
+ newModel.setBy14(meeting.getStartTime());
}else {
- newModel.setBy3(dataById.getTitle());
+ newModel.setBy14(dataById.getStartTime());
}
+
+ if(StringUtils.isEmpty(String.valueOf(meeting.getEndTime()))){
+ newModel.setBy15(meeting.getEndTime());
+ }else {
+ newModel.setBy15(dataById.getEndTime());
+ }
+
+
+ if(StringUtils.isEmpty(String.valueOf(meeting.getIsPlacebrand()))){
+ newModel.setBy11(meeting.getIsPlacebrand());
+ }else {
+ newModel.setBy11(dataById.getIsPlacebrand());
+ }
+
+ if(meeting.getConnPhone()!=null){
+ newModel.setBy12(meeting.getConnPerson());
+ }else {
+ newModel.setBy12(dataById.getConnPerson());
+ }
+
if(meeting.getConnPhone()!=null){
newModel.setBy4(meeting.getConnPhone());
}else {
newModel.setBy4(dataById.getConnPhone());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson()))){
- newModel.setBy5(String.valueOf(meeting.getApplyPerson()));
+ if(StringUtils.isEmpty(String.valueOf(meeting.getStatu()))){
+ newModel.setBy13(meeting.getStatu());
}else {
- newModel.setBy5(String.valueOf(dataById.getApplyPerson()));
+ newModel.setBy13(dataById.getStatu());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getPartPeople()))){
- newModel.setBy6(String.valueOf(meeting.getPartPeople()));
+ if(StringUtils.isEmpty(String.valueOf(meeting.getCreateTime()))){
+ newModel.setBy16(meeting.getCreateTime());
}else {
- newModel.setBy6(String.valueOf(dataById.getPartPeople()));
+ newModel.setBy16(dataById.getCreateTime());
}
-
- if(StringUtils.isEmpty(String.valueOf(meeting.getConnPerson()))){
- newModel.setBy7(String.valueOf(meeting.getConnPerson()));
- }else {
- newModel.setBy7(String.valueOf(dataById.getConnPerson()));
- }
-
UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
updateRequest.doc(
"by1",newModel.getBy1(),
"by2",newModel.getBy2(),
- "by3",newModel.getBy3(),
- "by4",newModel.getBy4(),
- "by6",newModel.getBy6(),
- "by7",newModel.getBy7()
+ "by3",newModel.getBy8(),
+ "by4",newModel.getBy9(),
+ "by5",newModel.getBy10(),
+ "by6",newModel.getBy11(),
+ "by7",newModel.getBy3(),
+ "by8",newModel.getBy14(),
+ "by9",newModel.getBy15(),
+ "by10",newModel.getBy12(),
+ "by11",newModel.getBy4(),
+ "by12",newModel.getBy13(),
+ "by13",newModel.getBy15()
+
);
try {
@@ -311,16 +359,16 @@
@Override
public AjaxResult addData(Meeting meeting) {
- ZInfoUser myself = zInfoUserService.getMyself();
- Long familyId = myself.getFamilyId();
-
- if(familyId == null){
- throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
- }
-
- List<ZAuthority> authority = zAuthorityService.getAuthority();
- List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
- familyIdList.add(familyId);
+// ZInfoUser myself = zInfoUserService.getMyself();
+// Long familyId = myself.getFamilyId();
+//
+// if(familyId == null){
+// throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
+// }
+//
+// List<ZAuthority> authority = zAuthorityService.getAuthority();
+// List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
+// familyIdList.add(familyId);
// if (meeting.getFamilyId()!=null && !familyIdList.contains(zfEvent.getFamilyId())) {
// throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
@@ -347,17 +395,24 @@
esModel.setId(uuid);
esModel.setCtId(Long.valueOf(inte));
esModel.setCtTableName("浼氳璁板綍");
- esModel.setBy1(meeting.getPlace());
- esModel.setBy2(meeting.getApplyApart());
- esModel.setBy3(meeting.getTitle());
+ esModel.setBy1(meeting.getTitle());
+ esModel.setBy2(meeting.getPlace());
+ esModel.setBy8(meeting.getConPeople());
+ esModel.setBy9(meeting.getPartPeople());
+ esModel.setBy10(meeting.getApplyPerson());
+ esModel.setBy3(meeting.getApplyApart());
+ esModel.setBy14(meeting.getStartTime());
+ esModel.setBy15(meeting.getEndTime());
+ esModel.setBy11(meeting.getIsPlacebrand());
+ esModel.setBy12(meeting.getConnPerson());
esModel.setBy4(meeting.getConnPhone());
- esModel.setBy5(String.valueOf(meeting.getApplyPerson()));
- esModel.setBy6(String.valueOf(meeting.getPartPeople()));
- esModel.setBy7(String.valueOf(meeting.getConnPerson()));
+ esModel.setBy13(meeting.getStatu());
+ esModel.setBy16(meeting.getCreateTime());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esModel.setBy5("/zMeeting");
// esModel.setFid(familyId);
esSer.insertTable(esModel);
+ System.out.println(esModel);
return AjaxResult.success();
} else {
--
Gitblit v1.9.1