From 27fff67070616dacd6c5af18d07a988d28a04de7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 九月 2025 17:35:58 +0800
Subject: [PATCH] 个人记事本新增结束时间
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java | 111 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 25 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
index e059439..cbabd79 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.mapper.ZfAncestorMapper;
import com.ruoyi.service.*;
import org.elasticsearch.action.delete.DeleteRequest;
+import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,7 @@
import javax.annotation.Resource;
import java.io.IOException;
+import java.time.LocalDateTime;
import java.util.*;
@Service
@@ -45,6 +47,9 @@
@Resource
private ZfClanService zfClanService;
+
+ @Resource
+ ZfLogService zfLogService;
private LambdaQueryWrapper<ZfAncestor> buildCondition(ZfAncestor zfAncestor) {
@@ -134,6 +139,7 @@
@Override
public List<AncestorClan> selectByCondition(ZfAncestor zfAncestor) {
QueryWrapper<Object> lqw = new QueryWrapper<>();
+ lqw.eq(zfAncestor.getClanId() !=null , " zf_ancestor.clan_id", zfAncestor.getClanId());
lqw.like(StringUtils.isNotEmpty(zfAncestor.getName()),"zf_ancestor.name",zfAncestor.getName());
@@ -273,35 +279,90 @@
}
@Override
- public ZfAncestor update(ZfAncestor zfAncestor) {
- LambdaQueryWrapper<ZfAncestor> lqw = uniqueCondition(zfAncestor);
- List<ZfAncestor> list = list(lqw);
+ public AjaxResult update(ZfAncestor zfAncestor) {
+// LambdaQueryWrapper<ZfAncestor> lqw = uniqueCondition(zfAncestor);
+// List<ZfAncestor> list = list(lqw);
// System.out.println(list);
- ZInfoUser updateDate =zInfoUserService.getInfoBysysId(zfAncestor.getSysId());
- ZfAncestor zfAncestor1 = new ZfAncestor();
- ZfAncestor zfAncestor2 = new ZfAncestor();
- zfAncestor1.setId(list.get(0).getId());
- zfAncestor1.setName(zfAncestor.getName());
- System.out.println(updateDate);
- if (zfAncestor.getSex() != null){
- if(updateDate.getSpouseId() != null && updateDate.getSpouseId() != 0){
- Long spouseId=updateDate.getSpouseId();
- if (zInfoUserService.getById(spouseId).getSex().equals(zfAncestor.getSex())){
+// ZInfoUser updateDate =zInfoUserService.getInfoBysysId(zfAncestor.getSysId());
+// ZfAncestor zfAncestor1 = new ZfAncestor();
+// ZfAncestor zfAncestor2 = new ZfAncestor();
+// zfAncestor1.setId(list.get(0).getId());
+// zfAncestor1.setName(zfAncestor.getName());
+// System.out.println(updateDate);
+// if (zfAncestor.getSex() != null){
+// if(updateDate.getSpouseId() != null && updateDate.getSpouseId() != 0){
+// Long spouseId=updateDate.getSpouseId();
+// if (zInfoUserService.getById(spouseId).getSex().equals(zfAncestor.getSex())){
+//
+// Long spouseSysId = zInfoUserService.getById(spouseId).getSysId();
+// zfAncestor2.setSysId(spouseSysId);
+// Integer spId = list(uniqueCondition(zfAncestor2)).get(0).getId();
+// zfAncestor2.setId(spId);
+// zfAncestor2.setSex(zfAncestor.getSex() == 0? 1: 0);
+// System.out.println(zfAncestor2);
+// zfAncestorService.updateById(zfAncestor2);
+// }}
+// zfAncestor1.setSex(zfAncestor.getSex());}
+//// System.out.println("1841vdndigrrr"+zfAncestor1);
+//
+// zfAncestorService.updateById(zfAncestor1);
- Long spouseSysId = zInfoUserService.getById(spouseId).getSysId();
- zfAncestor2.setSysId(spouseSysId);
- Integer spId = list(uniqueCondition(zfAncestor2)).get(0).getId();
- zfAncestor2.setId(spId);
- zfAncestor2.setSex(zfAncestor.getSex() == 0? 1: 0);
- System.out.println(zfAncestor2);
- zfAncestorService.updateById(zfAncestor2);
- }}
- zfAncestor1.setSex(zfAncestor.getSex());}
-// System.out.println("1841vdndigrrr"+zfAncestor1);
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("瀹舵棌淇敼");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+ System.out.println("===================================="+zfAncestor);
- zfAncestorService.updateById(zfAncestor1);
+ LambdaQueryWrapper<ZfAncestor> lqw = uniqueCondition(zfAncestor);
+ ZfAncestor zfAncestorList = list(lqw).get(0);
+ zfAncestor.setId(zfAncestorList.getId());
+ System.out.println(zfAncestorList);
+ if(updateById(zfAncestor)){
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfAncestor dataById = getById(zfAncestor.getId());
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esSer.findByCtId(dataById.getId(), "瀹舵棌");
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+ System.out.println("-------------------------"+zfAncestor);
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+// System.out.println(meeting);
+// System.out.println("=============="+meeting.getConnPhone());
+ if(zfAncestor.getSex() != null){
+ newModel.setBy8(zfAncestor.getSex());
+ }else {
+ newModel.setBy8(dataById.getSex());
+ }
- return zfAncestor2;
+ if(zfAncestor.getName() != null){
+ newModel.setBy2(zfAncestor.getName());
+ }else {
+ newModel.setBy2(dataById.getName());
+ }
+
+
+
+ UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+ updateRequest.doc(
+ "by1",newModel.getBy8(),
+ "by2",newModel.getBy2()
+
+ );
+
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error();
+ }
}
@Override
--
Gitblit v1.9.1