From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java |  173 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 161 insertions(+), 12 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index 88b3cf2..dd20954 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -5,25 +5,26 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.EsModel;
 import com.ruoyi.common.utils.MapUtils;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.*;
 import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfEvent;
 import com.ruoyi.mapper.ZfEventMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfEventService;
-import com.ruoyi.util.ArraysUtil;
+import com.ruoyi.service.*;
 import lombok.extern.slf4j.Slf4j;
+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.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -49,7 +50,18 @@
 
     @Resource
     ZAuthorityService zAuthorityService;
+    //鍔犲叆鍒癳s涓�
+    @Resource
+    private EsService esSer;
 
+    @Resource
+    private ZfEventDownloadService zfEventDownloadService;
+
+    @Resource
+    private ZfEventShareService zfEventShareService;
+
+    @Resource
+    private RestHighLevelClient restHighLevelClient;
     private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent,List<Long> familyIdList) {
         LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
         lqw.orderByDesc(ZfEvent::getCreateTime);
@@ -201,17 +213,33 @@
 //        String secondFamilyIds = listSecondFamilyIds();
         //瑕佹煡鑷繁瀹跺涵鐨�
         ZInfoUser myself = zInfoUserService.getMyself();
+        System.out.println("================");
+
         Long familyId = myself.getFamilyId();
+
+        //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+        Long fatherFaId = 0L;
+        if(myself.getFatherId()!=null)
+            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+        Long motherFaId = 0L;
+        if(myself.getMomId()!=null)
+            motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
         List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
         //鍔犱笂鑷繁瀹跺涵鐨刬d
         idList.add(familyId);
+        System.out.println(authority);
+
+        //鍔犱笂鐖舵瘝瀹舵棌id
+        idList.add(fatherFaId);
+        idList.add(motherFaId);
 
         LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent, idList);
         List<ZfEvent> beanRecords = list(lambdaQueryWrapper);
         log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
-        return markOwnData(familyId, beanRecords);
+        return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
     }
 
     @Override
@@ -224,10 +252,10 @@
         return list;
     }
 
-    public List<ZfEvent> markOwnData(Long familyId,List<ZfEvent> beanRecords){
+    public List<ZfEvent> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEvent> beanRecords){
         return beanRecords.stream().peek(
                 bean -> {
-                    if (bean.getFamilyId() == familyId) {
+                    if (bean.getFamilyId() == familyId||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
                         bean.setOwnData(1);
                     } else {
                         bean.setOwnData(0);
@@ -258,12 +286,35 @@
     public AjaxResult selectDataList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) {
         //瑕佹煡鑷繁瀹跺涵鐨�
         ZInfoUser myself = zInfoUserService.getMyself();
+        if(myself==null)
+        {
+         //   System.out.println("ssssss");
+            return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�");
+        }
         Long familyId = myself.getFamilyId();
+        System.out.println("++++++++++++++++");
+        System.out.println(familyId);
+        System.out.println(myself.getFatherId());
+        System.out.println(zInfoUserService.getInfoById(myself.getFatherId()));
+        //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+        Long fatherFaId = 0L;
+        if(myself.getFatherId()!=null)
+            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+        Long motherFaId = 0L;
+        if(myself.getMomId()!=null)
+            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
+
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
         List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
         //鍔犱笂鑷繁瀹跺涵鐨刬d
         idList.add(familyId);
+
+        //鍔犱笂鐖舵瘝瀹舵棌id
+        idList.add(fatherFaId);
+        idList.add(motherFaId);
+
+        System.out.println(idList.size());
 //        String familyIds = listFamilyIds();
 //        String secondFamilyAuthority = listSecondFamilyIds();
         LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);
@@ -274,7 +325,9 @@
 
         List<ZfEvent> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
 
-        List<ZfEvent> dtoResult = markOwnData(familyId, beanRecords);
+        System.out.println(beanRecords);
+        System.out.println(beanRecords.size());
+        List<ZfEvent> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
 
         HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
         return AjaxResult.success(data);
@@ -341,6 +394,21 @@
         }
 
         if (save(zfEvent)) {
+            EsModel esModel = new EsModel();
+            Integer inte = zfEvent.getId();
+            String uuid = UUID.randomUUID().toString().replace("-","");
+            esModel.setId(uuid);
+            esModel.setCtId(Long.valueOf(inte));
+            esModel.setCtTableName("瀹跺ぇ浜嬭");
+            esModel.setBy1(zfEvent.getAddress());
+            esModel.setBy2(zfEvent.getPeople());
+            esModel.setBy3(zfEvent.getTitle());
+            esModel.setRemark(zfEvent.getRemark());
+            //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+            esModel.setBy5("/family/zfEvent");
+            esModel.setFid(familyId);
+            esSer.insertTable(esModel);
+
             return AjaxResult.success();
         } else {
             return AjaxResult.error();
@@ -403,7 +471,11 @@
 
     }
 
+    @Resource
+    ZfLogService zfLogService;
+
     @Override
+    @Transactional
     public AjaxResult updateData(ZfEvent zfEvent) {
         ZInfoUser myself = zInfoUserService.getMyself();
         Long familyId = myself.getFamilyId();
@@ -419,7 +491,65 @@
             throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
         }
 
-        if(updateById(zfEvent)){
+        //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+        ZfLog zfLog = new ZfLog();
+        zfLog.setUpdateTime(LocalDateTime.now());
+        zfLog.setModule("瀹跺ぇ浜嬭");
+        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+        zfLogService.save(zfLog);
+
+        if(zfEventService.updateById(zfEvent)){
+            //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+            ZfEvent dataById = getById(zfEvent.getId());
+
+            //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
+            EsModel esResult = esSer.findByCtId(dataById.getId(), "瀹跺ぇ浜嬭");
+
+            if (esResult == null){
+                return AjaxResult.success();
+            }
+
+            //鎿嶄綔es淇敼鏁版嵁
+            EsModel newModel = new EsModel();
+            if(zfEvent.getAddress()!=null){
+                newModel.setBy1(zfEvent.getAddress());
+            }else {
+                newModel.setBy1(dataById.getAddress());
+            }
+
+            if(zfEvent.getPeople()!=null){
+                newModel.setBy2(zfEvent.getPeople());
+            }else {
+                newModel.setBy2(dataById.getPeople());
+            }
+
+            if(zfEvent.getTitle()!=null){
+                newModel.setBy3(zfEvent.getTitle());
+            }else {
+                newModel.setBy3(dataById.getTitle());
+            }
+
+            if(zfEvent.getRemark()!=null){
+                newModel.setRemark(zfEvent.getRemark());
+            }else {
+                newModel.setRemark(dataById.getRemark());
+            }
+
+            UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+            updateRequest.doc(
+                    "by1",newModel.getBy1(),
+                    "by2",newModel.getBy2(),
+                    "by3",newModel.getBy3(),
+                    "by4",newModel.getBy4(),
+                    "remark",newModel.getRemark()
+            );
+
+            try {
+                restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+
             return AjaxResult.success();
         }else {
             return AjaxResult.error();
@@ -444,7 +574,26 @@
             }
         }
 
+        List<ZfEvent> zfEvents = listByIds(Arrays.asList(ids));
+        if (! (zfEventDownloadService.deleteData(ids) && zfEventShareService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
+
         if (zfEventService.removeByIds(Arrays.asList(ids))) {
+            //鍒犻櫎es涓殑鏁版嵁
+            zfEvents.stream().forEach(zfEvent -> {
+                EsModel esModel = esSer.findByCtId(zfEvent.getId(), "瀹跺ぇ浜嬭");
+                if (esModel != null){
+                    DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+                    try {
+                        restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            });
+
+
             return AjaxResult.success();
         }else {
             return AjaxResult.error();

--
Gitblit v1.9.1