From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java |   85 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index e925a07..d0452ab 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -6,16 +6,13 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.EsModel;
-import com.ruoyi.common.core.domain.entity.SysUser;
 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.ZfEquipment;
 import com.ruoyi.mapper.ZfEquipmentMapper;
 import com.ruoyi.service.*;
-import com.ruoyi.util.ArraysUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.update.UpdateRequest;
@@ -59,9 +56,18 @@
     @Resource
     private RestHighLevelClient restHighLevelClient;
 
+    @Resource
+    private ZfEquipShareService zfEquipShareService;
+
+    @Resource
+    private ZfEquipDownloadService zfEquipDownloadService;
+
+    @Resource
+    private MemoBookService memoBookService;
+
     private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
         LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
-        lqw.orderByDesc(ZfEquipment::getCreateTime);
+        lqw.orderByDesc(ZfEquipment::getHappenTime);
         lqw.like(StringUtils.isNotEmpty(zfEquipment.getName()), ZfEquipment::getName, zfEquipment.getName());
         lqw.like(StringUtils.isNotEmpty(zfEquipment.getBuyer()), ZfEquipment::getBuyer, zfEquipment.getBuyer());
         lqw.like(StringUtils.isNotEmpty(zfEquipment.getContent()), ZfEquipment::getContent, zfEquipment.getContent());
@@ -220,16 +226,30 @@
         //瑕佹煡鑷繁瀹跺涵鐨�
         ZInfoUser myself = zInfoUserService.getMyself();
         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.getInfoById(myself.getMomId()).getFamilyId();
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
         List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
         //鍔犱笂鑷繁瀹跺涵鐨刬d
         idList.add(familyId);
 
+        //鍔犱笂鐖舵瘝瀹舵棌id
+        idList.add(fatherFaId);
+        idList.add(motherFaId);
+        List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+        if(!fms.isEmpty())
+        {
+            idList.addAll(fms);
+        }
         LambdaQueryWrapper<ZfEquipment> lambdaQueryWrapper = buildCondition(zfEquipment, idList);
         List<ZfEquipment> beanRecords = list(lambdaQueryWrapper);
         log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
-        return markOwnData(familyId, beanRecords);
+        return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);
     }
 
     @Override
@@ -259,10 +279,10 @@
 //        }).collect(Collectors.toList());
 //    }
 
-    public List<ZfEquipment> markOwnData(Long familyId,List<ZfEquipment> beanRecords){
+    public List<ZfEquipment> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfEquipment> beanRecords){
         return beanRecords.stream().peek(
                 bean -> {
-                    if (bean.getFamilyId() == familyId) {
+                    if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
                         bean.setOwnData(1);
                     } else {
                         bean.setOwnData(0);
@@ -289,12 +309,32 @@
 
         //瑕佹煡鑷繁瀹跺涵鐨�
         ZInfoUser myself = zInfoUserService.getMyself();
+        if(myself==null)
+        {
+            //   System.out.println("ssssss");
+            return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�");
+        }
         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.getInfoById(myself.getMomId()).getFamilyId();
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
         List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
         //鍔犱笂鑷繁瀹跺涵鐨刬d
         idList.add(familyId);
+
+        //鍔犱笂鐖舵瘝瀹舵棌id
+        idList.add(fatherFaId);
+        idList.add(motherFaId);
+        List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+        if(!fms.isEmpty())
+        {
+            idList.addAll(fms);
+        }
 //        String familyIds = listFamilyIds();
 //        String secondFamilyAuthority = listSecondFamilyIds();
         LambdaQueryWrapper<ZfEquipment> lqw = buildCondition(zfEquipment, idList);
@@ -305,7 +345,7 @@
 
         List<ZfEquipment> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
 
-        List<ZfEquipment> dtoResult = markOwnData(familyId, beanRecords);
+        List<ZfEquipment> dtoResult = markOwnData(familyId, fatherFaId, motherFaId,beanRecords);
 
         HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
         return AjaxResult.success(data);
@@ -445,7 +485,10 @@
         log.info("璧勪骇鍒楄〃涓猴細{}", propertyList);
 
         for (ZfEquipment zfEquipment : propertyList) {
-            zfEquipmentService.addData(zfEquipment);
+            if (zfEquipment.getName().length() != 0  && zfEquipment.getContent().length() != 0 && zfEquipment.getBuyer() .length() != 0){
+                zfEquipmentService.addData(zfEquipment);
+            }
+
         }
 
         return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
@@ -485,6 +528,10 @@
 
             //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
             EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵璁惧");
+
+            if (esResult == null){
+                return AjaxResult.success();
+            }
 
             //鎿嶄綔es淇敼鏁版嵁
             EsModel newModel = new EsModel();
@@ -556,22 +603,32 @@
             if (!familyIdList.contains(data.getFamilyId())){
                 throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
             }
+
+            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(data.getId(),2017L);
+            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
+                return AjaxResult.error();
         }
 
         List<ZfEquipment> zfEquipments = listByIds(Arrays.asList(ids));
+        if (! (zfEquipDownloadService.deleteData(ids) && zfEquipShareService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
 
         if (zfEquipmentService.removeByIds(Arrays.asList(ids))) {
 
             //鍒犻櫎es涓殑鏁版嵁
             zfEquipments.stream().forEach(zfEquipment -> {
                 EsModel esModel = esService.findByCtId(zfEquipment.getId().intValue(), "瀹跺涵璁惧");
-                DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
-                try {
-                    restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+                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