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/ZfEconomyServiceImpl.java |  584 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 583 insertions(+), 1 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index f26764d..0b82238 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -1,11 +1,34 @@
 package com.ruoyi.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.EsModel;
+import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.*;
 import com.ruoyi.domain.ZfEconomy;
 import com.ruoyi.mapper.ZfEconomyMapper;
-import com.ruoyi.service.ZfEconomyService;
+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;
+
+import static com.ruoyi.constant.MenuAuthority.*;
 
 /**
  * <p>
@@ -16,6 +39,565 @@
  * @since 2023-03-12
  */
 @Service
+@Slf4j
 public class ZfEconomyServiceImpl extends ServiceImpl<ZfEconomyMapper, ZfEconomy> implements ZfEconomyService {
+    @Resource
+    ZfEconomyService zfEconomyService;
+
+    @Resource
+    ZInfoUserService zInfoUserService;
+
+    @Resource
+    ZAuthorityService zAuthorityService;
+
+    @Resource
+    ZfEconomyMapper zfEconomyMapper;
+
+    @Resource
+    EsService esService;
+
+    @Resource
+    RestHighLevelClient restHighLevelClient;
+
+    @Resource
+    ZfEconomyShaService zfEconomyShaService;
+
+    @Resource
+    ZfEconomyDownlService zfEconomyDownlService;
+
+    private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy,List<Long> familyIdList) {
+        LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
+        lqw.orderByDesc(ZfEconomy::getCreateTime);
+        lqw.in(ZfEconomy::getFamilyId,familyIdList);
+        lqw.like(StringUtils.isNotEmpty(zfEconomy.getType()),ZfEconomy::getType,zfEconomy.getType());
+        lqw.like(StringUtils.isNotEmpty(zfEconomy.getKind()),ZfEconomy::getKind,zfEconomy.getKind());
+        lqw.like(StringUtils.isNotEmpty(zfEconomy.getPrice()),ZfEconomy::getPrice,zfEconomy.getPrice());
+        lqw.like(StringUtils.isNotEmpty(zfEconomy.getUseFor()),ZfEconomy::getUseFor,zfEconomy.getUseFor());
+        lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
+        lqw.like(StringUtils.isNotEmpty(zfEconomy.getBalance()),ZfEconomy::getBalance,zfEconomy.getBalance());
+        lqw.like(StringUtils.isNotEmpty(zfEconomy.getRemark()),ZfEconomy::getRemark,zfEconomy.getRemark());
+        lqw.eq(zfEconomy.getHappenTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenTime());
+        lqw.between(zfEconomy.getHappenStartTime() != null && zfEconomy.getHappenEndTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenStartTime(), zfEconomy.getHappenEndTime());
+        return lqw;
+    }
+
+    private LambdaQueryWrapper<ZfEconomy> uniqueCondition(ZfEconomy zfEconomy) {
+        LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotEmpty(zfEconomy.getType()),ZfEconomy::getType,zfEconomy.getType());
+        lqw.eq(StringUtils.isNotEmpty(zfEconomy.getKind()),ZfEconomy::getKind,zfEconomy.getKind());
+        lqw.eq(StringUtils.isNotEmpty(zfEconomy.getPrice()),ZfEconomy::getPrice,zfEconomy.getPrice());
+        lqw.eq(StringUtils.isNotEmpty(zfEconomy.getUseFor()),ZfEconomy::getUseFor,zfEconomy.getUseFor());
+        lqw.eq(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
+        lqw.eq(StringUtils.isNotEmpty(zfEconomy.getBalance()),ZfEconomy::getBalance,zfEconomy.getBalance());
+        lqw.eq(StringUtils.isNotEmpty(zfEconomy.getRemark()),ZfEconomy::getRemark,zfEconomy.getRemark());
+        lqw.eq(zfEconomy.getFamilyId()!=null,ZfEconomy::getFamilyId,zfEconomy.getFamilyId());
+        lqw.eq(zfEconomy.getHappenTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenTime());
+        return lqw;
+    }
+    @Override
+    public List<ZfEconomy> change(){
+        ZfEconomy zfEconomy = new ZfEconomy();
+       return list(buildCondition(zfEconomy,null));
+    }
+
+//    private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy, String familyIds, String secondFamilyAuthority) {
+//        //妯$硦鏌ヨ鐨勬潯浠�
+//        LambdaQueryWrapper<ZfEconomy> lqw = buildCondition(zfEconomy);
+//
+//        //瀹氫箟涓�涓竷灏旀爣璁帮紝鏍囪绗竴瀹跺涵鍙锋槸鍚︽湁閫楀彿
+//        boolean flag = false;
+//
+//        StringBuilder secondFamilyIdsBuffer = new StringBuilder();
+//
+//        //澶勭悊浼犲叆鐨剆econdFamilyAuthority   3{2007 2018 2015},4{2007 2019}
+//
+//        if (StringUtils.isNotEmpty(secondFamilyAuthority)) {
+//
+//            if (secondFamilyAuthority.contains(",")) {
+//                //閫楀彿闅斿紑寰楀埌濡備笅涓诧細3{2007 2018 2015}
+//                String[] authorityList = secondFamilyAuthority.split(",");
+//                for (String authorityAndId : authorityList) {
+//                    setSecondFamilyAuthority(secondFamilyIdsBuffer, authorityAndId);
+//                }
+//
+//                //鎶婂悗闈㈢殑閫楀彿鍘绘帀
+//                if (secondFamilyIdsBuffer.length() > 1) {
+//                    secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
+//                }
+//
+//            }else{
+//                setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority);
+//                //鎶婂悗闈㈢殑閫楀彿鍘绘帀
+//                if (secondFamilyIdsBuffer.length() > 1) {
+//                    secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
+//                }
+//            }
+//        }
+//        //灏哠tringBuffer杞垚String
+//        String secondFamilyIds = secondFamilyIdsBuffer.toString();
+//
+//        //绗竴瀹跺涵鍙风殑鏉′欢
+//        if (familyIds.contains(",")) {
+//            flag = true;
+//        }
+//
+//        //绗簩瀹跺涵鍙风殑鏉′欢
+//        if (StringUtils.isNotEmpty(secondFamilyIds)) {
+//            if (secondFamilyIds.contains(",")) {
+//                String[] secondFamilyIdList = secondFamilyIds.split(",");
+//                if (flag) {
+//                    //濡傛灉绗竴瀹跺涵鍙峰拰绗簩瀹跺涵鍙烽兘鏈夐�楀彿
+//                    String[] familyList = familyIds.split(",");
+//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIdList);
+//                    lqw.in(ZfEconomy::getFamilyId, totalFamilyIdList);
+//                } else {
+//                    //濡傛灉绗竴瀹跺涵鍙锋病鏈夐�楀彿浣嗘槸绗簩瀹跺涵鍙锋湁閫楀彿
+//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(secondFamilyIdList, familyIds);
+//                    lqw.in(ZfEconomy::getFamilyId, totalFamilyIdList);
+//                }
+//
+//            } else {
+//                if (flag) {
+//                    //濡傛灉绗竴瀹跺涵鍙锋湁閫楀彿浣嗙浜屽搴彿娌℃湁閫楀彿
+//                    String[] familyList = familyIds.split(",");
+//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIds);
+//                    lqw.in(ZfEconomy::getFamilyId, totalFamilyIdList);
+//                } else {
+//                    //濡傛灉绗竴瀹跺涵鍙峰拰绗簩瀹跺涵鍙烽兘娌℃湁閫楀彿
+//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyIds, secondFamilyIds);
+//                    lqw.in(ZfEconomy::getFamilyId, totalFamilyIdList);
+//                }
+//            }
+//        } else {
+//            //濡傛灉娌℃湁绗簩瀹跺涵鍙�
+//            if (flag) {
+//                String[] familyList = familyIds.split(",");
+//                lqw.in(ZfEconomy::getFamilyId, familyList);
+//            } else {
+//                lqw.eq(ZfEconomy::getFamilyId, familyIds);
+//            }
+//
+//        }
+//
+//        lqw.orderByDesc(ZfEconomy::getCreateTime);
+//        return lqw;
+//    }
+//
+//    private void setSecondFamilyAuthority(StringBuilder secondFamilyIdsBuffer, String authorityAndId) {
+//        //寰楀埌鏉冮檺涓�
+//        String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);
+//
+//        if (authorities.contains(" ")) {
+//            //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
+//            String[] authorityIdList = authorities.split(" ");
+//            for (String s : authorityIdList) {
+//                if (s.equals(ECONOMY_LIST)) {
+//                    secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+//                    break;
+//                }
+//            }
+//        } else {
+//            if (authorities.equals(ECONOMY_LIST)) {
+//                secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+//            }
+//        }
+//    }
+//
+//    private ZInfoUser getMySelf() {
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        Long userId = user.getUserId();
+//        LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId, userId);
+//        return zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
+//    }
+//
+//    private String listFamilyIds() {
+//        ZInfoUser mySelf = getMySelf();
+//        return mySelf.getFamilyId();
+//    }
+//
+//    private String listSecondFamilyIds() {
+//        ZInfoUser mySelf = getMySelf();
+//        return mySelf.getSecondFamilyId();
+//    }
+
+    @Override
+    public List<ZfEconomy> selectByCondition(ZfEconomy zfEconomy) {
+//        String familyIds = listFamilyIds();
+//        String secondFamilyIds = listSecondFamilyIds();
+//        LambdaQueryWrapper<ZfEconomy> lambdaQueryWrapper = buildCondition(zfEconomy, familyIds, secondFamilyIds);
+//        List<ZfEconomy> beanRecords = list(lambdaQueryWrapper);
+//        log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
+//        return markOwnData(familyIds, beanRecords);
+
+        //瑕佹煡鑷繁瀹跺涵鐨�
+        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(ECONOMY_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<ZfEconomy> lambdaQueryWrapper = buildCondition(zfEconomy, idList);
+        List<ZfEconomy> beanRecords = list(lambdaQueryWrapper);
+        log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
+        return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
+    }
+
+    @Override
+    public List<ZfEconomy> selectByIds(Long[] ids) {
+        List<ZfEconomy> list = new ArrayList<>();
+        if(ids.length!=0)
+            list = listByIds(Arrays.asList(ids));
+        else
+            list = list();
+        return list;
+    }
+
+//    private List<ZfEconomy> markOwnData(String familyIds, List<ZfEconomy> beanRecords) {
+//        return beanRecords.stream().peek(record -> {
+//            String recordFamilyId = record.getFamilyId();
+//            if (familyIds.contains(",")) {
+//                String[] familyIdList = familyIds.split(",");
+//                for (String familyId : familyIdList) {
+//                    if (familyId.equals(recordFamilyId)) {
+//                        record.setOwnData(1);
+//                    }
+//                }
+//            } else {
+//                if (familyIds.equals(recordFamilyId)) {
+//                    record.setOwnData(1);
+//                }
+//            }
+//        }).collect(Collectors.toList());
+//    }
+
+    @Override
+    public AjaxResult selectDataList(ZfEconomy zfEconomy, Integer pageNum, Integer pageSize) {
+//        String familyIds = listFamilyIds();
+//        String secondFamilyAuthority = listSecondFamilyIds();
+//        LambdaQueryWrapper<ZfEconomy> lqw = buildCondition(zfEconomy, familyIds, secondFamilyAuthority);
+//
+//        Page<ZfEconomy> zfEconomyPage = new Page<>(pageNum, pageSize);
+//        Page<ZfEconomy> pageResult = page(zfEconomyPage, lqw);
+//
+//        List<ZfEconomy> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+//
+//        List<ZfEconomy> dtoResult = markOwnData(familyIds, beanRecords);
+//
+//        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
+//        return AjaxResult.success(data);
+
+        //瑕佹煡鑷繁瀹跺涵鐨�
+        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(ECONOMY_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<ZfEconomy> lqw = buildCondition(zfEconomy, idList);
+
+
+        Page<ZfEconomy> zfEconomyPage = new Page<>(pageNum, pageSize);
+        Page<ZfEconomy> pageResult = page(zfEconomyPage, lqw);
+
+        List<ZfEconomy> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+        List<ZfEconomy> dtoResult = markOwnData(familyId, fatherFaId, motherFaId,beanRecords);
+
+        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
+        return AjaxResult.success(data);
+    }
+
+    public List<ZfEconomy> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEconomy> beanRecords){
+        return beanRecords.stream().peek(
+                bean -> {
+                    if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
+                        bean.setOwnData(1);
+                    } else {
+                        bean.setOwnData(0);
+                    }
+                }
+        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
+    }
+
+
+//    @Override
+//    public AjaxResult addData2(ZfEconomy zfEconomy){
+//        ZInfoUser mySelf = getMySelf();
+//        String myFamilyId = mySelf.getFamilyId();
+//
+//        if (StringUtils.isNotEmpty(zfEconomy.getFamilyId())){
+//            throw new RuntimeException("瀵煎叆鏁版嵁鏃舵偍涓嶈兘鎸囧畾瀹跺涵鍙�");
+//        }
+//
+//        if(StringUtils.isEmpty(myFamilyId)){
+//            throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
+//        }
+//
+//        if (myFamilyId.contains(",")){
+//            String[] myFamilyIds = myFamilyId.split(",");
+//            //榛樿娣诲姞绗竴涓搴殑鏁版嵁
+//            zfEconomy.setFamilyId(myFamilyIds[0]);
+//        }else {
+//            zfEconomy.setFamilyId(myFamilyId);
+//        }
+//
+//        //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+//        LambdaQueryWrapper<ZfEconomy> lqw = uniqueCondition(zfEconomy);
+//        List<ZfEconomy> list = list(lqw);
+//        if(list.size()>0){
+//            throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+//        }
+//
+//        if (save(zfEconomy)) {
+//            return AjaxResult.success();
+//        }else {
+//            return AjaxResult.error();
+//        }
+//    }
+
+
+    @Override
+    @Transactional
+    public AjaxResult importExcel(MultipartFile file) {
+        ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class);
+        List<ZfEconomy> dataList = null;
+        try {
+            dataList = util.importExcel(file.getInputStream());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        log.info("鍑嗗瑕佸鍏ョ殑鏁版嵁鍒楄〃涓猴細{}", dataList);
+
+        for (ZfEconomy zfEconomy : dataList) {
+            zfEconomyService.addData(zfEconomy);
+        }
+
+        return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
+
+    }
+
+    @Override
+    public AjaxResult addData(ZfEconomy zfEconomy) {
+        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(ECONOMY_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
+        familyIdList.add(familyId);
+
+        if (zfEconomy.getFamilyId()!=null && !familyIdList.contains(zfEconomy.getFamilyId())) {
+            throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+        }
+
+
+        if(zfEconomy.getFamilyId() == null){
+            //榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹�
+            zfEconomy.setFamilyId(familyId);
+        }
+
+        //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+        LambdaQueryWrapper<ZfEconomy> lqw = uniqueCondition(zfEconomy);
+        List<ZfEconomy> list = list(lqw);
+
+        if(list.size()>0){
+            throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+        }
+
+        if (save(zfEconomy)) {
+            EsModel esModel = new EsModel();
+            Integer inte = zfEconomy.getId().intValue();
+            String uuid = UUID.randomUUID().toString().replace("-","");
+            esModel.setId(uuid);
+            esModel.setCtId(Long.valueOf(inte));
+            esModel.setCtTableName("瀹跺涵鏀舵敮鍙拌处");
+            esModel.setBy1(zfEconomy.getUseFor());
+            esModel.setBy2(zfEconomy.getUsePeople());
+            esModel.setBy5("/family/zfEconomy");
+            esModel.setRemark(zfEconomy.getRemark());
+            esModel.setFid(familyId);
+            //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+            esService.insertTable(esModel);
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
+
+    @Resource
+    ZfLogService zfLogService;
+
+    @Override
+    public AjaxResult updateData(ZfEconomy zfEconomy) {
+        ZInfoUser myself = zInfoUserService.getMyself();
+        Long familyId = myself.getFamilyId();
+
+        //鍏堟牴鎹甶d鏌ヨ鍑烘暟鎹殑familyId锛岀湅鐪嬫湁娌℃湁鏉冮檺鎿嶄綔
+        Long dataFamilyId = getById(zfEconomy.getId()).getFamilyId();
+
+        List<ZAuthority> authority = zAuthorityService.getAuthority();
+        List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(ECONOMY_LIST_UPDATE)).map(ZAuthority::getFid).collect(Collectors.toList());
+        familyIdList.add(familyId);
+
+        if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
+            throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+        }
+
+        //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+        ZfLog zfLog = new ZfLog();
+        zfLog.setUpdateTime(LocalDateTime.now());
+        zfLog.setModule("瀹跺涵鏀舵敮鍙拌处");
+        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+        zfLogService.save(zfLog);
+
+        if(updateById(zfEconomy)){
+
+            //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+            ZfEconomy dataById = getById(zfEconomy.getId());
+
+            //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
+            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵鏀舵敮鍙拌处");
+
+            if (esResult == null){
+                return AjaxResult.success();
+            }
+
+            //鎿嶄綔es淇敼鏁版嵁
+            EsModel newModel = new EsModel();
+            if(zfEconomy.getUseFor()!=null){
+                newModel.setBy1(zfEconomy.getUseFor());
+            }else {
+                newModel.setBy1(dataById.getUseFor());
+            }
+
+            if(zfEconomy.getUsePeople()!=null){
+                newModel.setBy2(zfEconomy.getUsePeople());
+            }else {
+                newModel.setBy2(dataById.getUsePeople());
+            }
+
+            if(zfEconomy.getRemark()!=null){
+                newModel.setRemark(zfEconomy.getRemark());
+            }else {
+                newModel.setRemark(dataById.getRemark());
+            }
+
+
+            UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+            updateRequest.doc(
+                    "by1",newModel.getBy1(),
+                    "by2",newModel.getBy2(),
+                    "remark",newModel.getRemark()
+            );
+
+            try {
+                restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.error();
+        }
+    }
+
+    @Override
+    public AjaxResult deleteData(Long[] ids) {
+        List<ZfEconomy> dataList = zfEconomyService.listByIds(Arrays.asList(ids));
+
+        ZInfoUser myself = zInfoUserService.getMyself();
+        Long familyId = myself.getFamilyId();
+
+        List<ZAuthority> authority = zAuthorityService.getAuthority();
+        List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(ECONOMY_LIST_REMOVE)).map(ZAuthority::getFid).collect(Collectors.toList());
+        familyIdList.add(familyId);
+
+        for (ZfEconomy data : dataList) {
+            if (!familyIdList.contains(data.getFamilyId())){
+                throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+            }
+        }
+        List<ZfEconomy> zfEconomys = listByIds(Arrays.asList(ids));
+        if (! (zfEconomyDownlService.deleteData(ids) && zfEconomyShaService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
+        if (zfEconomyService.removeByIds(Arrays.asList(ids))) {
+
+            //鍒犻櫎es涓殑鏁版嵁
+            zfEconomys.stream().forEach(zfEconomy -> {
+                EsModel esModel = esService.findByCtId(zfEconomy.getId().intValue(), "瀹跺涵鏀舵敮鍙拌处");
+
+                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();
+        }
+    }
+
+    @Override
+    public AjaxResult listType() {
+        List<String> result = zfEconomyMapper.listType();
+        return AjaxResult.success(result);
+    }
+
 
 }

--
Gitblit v1.9.1