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/IZfPropertyServiceImpl.java |  682 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 653 insertions(+), 29 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 4a881ba..9fffd7f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -1,17 +1,34 @@
 package com.ruoyi.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.utils.StringUtils;
-import com.ruoyi.domain.ZfProperty;
-import com.ruoyi.mapper.ZfPropertyMapper;
-import com.ruoyi.service.IZfPropertyService;
-import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.domain.entity.EsModel;
 
-import java.util.HashMap;
-import java.util.List;
+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.mapper.ZfPropertyMapper;
+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.*;
 
 
 /**
@@ -19,47 +36,654 @@
  * @Author Jin_quan Ou
  * @Date 2023-03-09 10:36
  */
+@Slf4j
 @Service
 public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
 
+    @Resource
+    IZfPropertyService zfPropertyService;
+
+    @Resource
+    ZInfoUserService zInfoUserService;
+
+    @Resource
+    ZAuthorityService zAuthorityService;
+
+    @Resource
+    ZfPropertyMapper zfPropertyMapper;
+    
+    @Resource
+    EsService esService;
+    
+    @Resource
+    RestHighLevelClient restHighLevelClient;
+
+    @Resource
+    private IZfPropertyDownloadService zfPropertyDownloadService;
+
+    @Resource
+    private IZfPropertyShareService iZfPropertyShareService;
+
+    @Resource
+    private MemoBookService memoBookService;
+
+
+//    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
+//        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
+//
+//        lqw.like(!StringUtils.isEmpty(zfProperty.getType()), ZfProperty::getType, zfProperty.getType())
+//                .like(!StringUtils.isEmpty(zfProperty.getTitle()), ZfProperty::getTitle, zfProperty.getTitle())
+//                .like(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
+//                .like(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
+//                .like(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
+//                .like(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
+//                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
+//                .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
+//        return lqw;
+//    }
+
+    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty,List<Long> familyIdList){
+        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
+
+        lqw.like(!StringUtils.isEmpty(zfProperty.getType()), ZfProperty::getType, zfProperty.getType())
+                .like(!StringUtils.isEmpty(zfProperty.getTitle()), ZfProperty::getTitle, zfProperty.getTitle())
+                .like(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
+                .like(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
+                .like(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
+                .like(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
+                .eq(zfProperty.getFamilyId()!=null,ZfProperty::getFamilyId,zfProperty.getFamilyId())
+                .in(ZfProperty::getFamilyId,familyIdList)
+                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
+                .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
+        lqw.orderByDesc(ZfProperty::getCreateTime);
+        return lqw;
+
+    }
+
+//    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty, String familyIds, String secondFamilyAuthority) {
+//        //妯$硦鏌ヨ鐨勬潯浠�
+//        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
+//
+//        //瀹氫箟涓�涓竷灏旀爣璁帮紝鏍囪绗竴瀹跺涵鍙锋槸鍚︽湁閫楀彿
+//        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(ZfProperty::getFamilyId, totalFamilyIdList);
+//                } else {
+//                    //濡傛灉绗竴瀹跺涵鍙锋病鏈夐�楀彿浣嗘槸绗簩瀹跺涵鍙锋湁閫楀彿
+//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(secondFamilyIdList, familyIds);
+//                    lqw.in(ZfProperty::getFamilyId, totalFamilyIdList);
+//                }
+//
+//            } else {
+//                if (flag) {
+//                    //濡傛灉绗竴瀹跺涵鍙锋湁閫楀彿浣嗙浜屽搴彿娌℃湁閫楀彿
+//                    String[] familyList = familyIds.split(",");
+//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIds);
+//                    lqw.in(ZfProperty::getFamilyId, totalFamilyIdList);
+//                } else {
+//                    //濡傛灉绗竴瀹跺涵鍙峰拰绗簩瀹跺涵鍙烽兘娌℃湁閫楀彿
+//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyIds, secondFamilyIds);
+//                    lqw.in(ZfProperty::getFamilyId, totalFamilyIdList);
+//                }
+//            }
+//        } else {
+//            //濡傛灉娌℃湁绗簩瀹跺涵鍙�
+//            if (flag) {
+//                String[] familyList = familyIds.split(",");
+//                lqw.in(ZfProperty::getFamilyId, familyList);
+//            } else {
+//                lqw.eq(ZfProperty::getFamilyId, familyIds);
+//            }
+//
+//        }
+//
+//        lqw.orderByDesc(ZfProperty::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(PROPERTY_LIST)) {
+//                    secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+//                    break;
+//                }
+//            }
+//        } else {
+//            if (authorities.equals(PROPERTY_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 Long listFamilyIds() {
+//        ZInfoUser mySelf = getMySelf();
+//        return mySelf.getFamilyId();
+//    }
+//
+//    private String listSecondFamilyIds() {
+//        ZInfoUser mySelf = getMySelf();
+//        return mySelf.getSecondFamilyId();
+//    }
+
     @Override
     public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
-        LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty);
-        return list(lambdaQueryWrapper);
+        //瑕佹煡鑷繁瀹跺涵鐨�
+        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(PROPERTY_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<ZfProperty> lqw = buildCondition(zfProperty, idList);
+        List<ZfProperty> beanRecords = list(lqw);
+        log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
+        return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);
     }
 
-    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
-        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
-        lqw.like(!StringUtils.isEmpty(zfProperty.getType()),ZfProperty::getType, zfProperty.getType());
-        lqw.like(!StringUtils.isEmpty(zfProperty.getTitle()),ZfProperty::getTitle, zfProperty.getTitle());
-        lqw.like(!StringUtils.isEmpty(zfProperty.getLocation()),ZfProperty::getLocation, zfProperty.getLocation());
-        lqw.like(!StringUtils.isEmpty(zfProperty.getHolder()),ZfProperty::getHolder, zfProperty.getHolder());
-        lqw.like(!StringUtils.isEmpty(zfProperty.getAddress()),ZfProperty::getAddress, zfProperty.getAddress());
-        lqw.like(!StringUtils.isEmpty(zfProperty.getRemark()),ZfProperty::getRemark, zfProperty.getRemark());
-        lqw.like(zfProperty.getCreateTime()!=null,ZfProperty::getCreateTime, zfProperty.getCreateTime());
-        return lqw;
+//    private static List<ZfProperty> markOwnData(String familyIds, List<ZfProperty> 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(ZfProperty zfProperty, Integer pageNum, Integer pageSize) {
+
+        //瑕佹煡鑷繁瀹跺涵鐨�
+        ZInfoUser myself = zInfoUserService.getMyself();
+        if(myself==null)
+        {
+            //   System.out.println("ssssss");
+            return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�");
+        }
+        Long familyId = myself.getFamilyId();
+        //涔熻鏌ュ埆浜烘巿鏉冪殑
+        List<ZAuthority> authority = zAuthorityService.getAuthority();
+        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(PROPERTY_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+
+        //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+        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();
+
+        //鍔犱笂鑷繁瀹跺涵鐨刬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<ZfProperty> lqw = buildCondition(zfProperty, idList);
+
+        Page<ZfProperty> zfPropertyPage = new Page<>(pageNum, pageSize);
+        Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
+
+        List<ZfProperty> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+        List<ZfProperty> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
+
+        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
+        return AjaxResult.success(data);
+    }
+
+    public List<ZfProperty> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfProperty> 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 selectUserList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
+    public List<ZfProperty> selectByIds(Long[] ids) {
+        List<ZfProperty> list = new ArrayList<>();
+        if(ids.length!=0)
+            list = listByIds(Arrays.asList(ids));
+        else
+            list = list();
+        return list;
+    }
 
-        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
+    @Override
+    public AjaxResult selectType() {
+        List<String> lis = list(new QueryWrapper<ZfProperty>().select("distinct (type)").lambda()).stream().map(ZfProperty::getType).collect(Collectors.toList());
+        return AjaxResult.success(lis);
+    }
 
-        Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
-        Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
+    @Override
+    public List<ZfProperty> selectByFamilyIds(Long[] familyIds) {
+        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
+        lqw.in(ZfProperty::getFamilyId,familyIds);
+        return list(lqw);
+    }
+
+//    @Override
+//    public AjaxResult addData(ZfProperty zfProperty) {
+//
+//        String familyIds = listFamilyIds();
+//        boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞�
+//        if (familyIds.contains(",")) {
+//            String[] familyList = familyIds.split(",");
+//            for (String familyId : familyList) {
+//                if (familyId.equals(zfProperty.getFamilyId())) {
+//                    flag = true;
+//                }
+//            }
+//        } else {
+//            if (zfProperty.getFamilyId().equals(familyIds)) {
+//                flag = true;
+//            }
+//        }
+//        if (flag) {
+//            if (save(zfProperty)) {
+//                return AjaxResult.success();
+//            } else {
+//                return AjaxResult.error();
+//            }
+//
+//        } else {
+//            throw new RuntimeException("浣犳病鏈夋搷浣滆瀹跺涵鍙蜂负" + zfProperty.getFamilyId() + "鏁版嵁鐨勬潈闄�");
+//        }
+//    }
+
+//    public Boolean checkAuthority(ZfProperty zfProperty, String code){
+//        ZInfoUser myself = zInfoUserService.getMyself();
+//        Long familyId = myself.getFamilyId();
+//
+//        List<ZAuthority> authority = zAuthorityService.getAuthority();
+//        List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(code)).map(ZAuthority::getFid).collect(Collectors.toList());
+//        familyIdList.add(familyId);
+//
+//        if(zfProperty.getFamilyId() == null){
+//            return false;
+//        }
+//
+//        if (!familyIdList.contains(zfProperty.getFamilyId())) {
+//            throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滃搴�"+zfProperty.getFamilyId()+"鐨勬暟鎹�");
+//        }
+//        return true;
+//    }
+
+    @Override
+    public AjaxResult addData(ZfProperty zfProperty){
+        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(PROPERTY_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
+        familyIdList.add(familyId);
+
+        if (zfProperty.getFamilyId()!=null && !familyIdList.contains(zfProperty.getFamilyId())) {
+            throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+        }
 
 
-        HashMap<String, Object> data = new HashMap<>();
+        if(zfProperty.getFamilyId() == null){
+            //榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹�
+            zfProperty.setFamilyId(familyId);
+        }
 
-        data.put("data",pageResult.getRecords());
-        data.put("total",pageResult.getTotal());
-        data.put("pageNum",pageResult.getCurrent());
-        data.put("pageSize",pageResult.getSize());
+        //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+        LambdaQueryWrapper<ZfProperty> lqw = uniqueCondition(zfProperty);
+        List<ZfProperty> list = list(lqw);
+
+        if(list.size()>0){
+            throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+        }
+
+        if (save(zfProperty)) {
+
+            EsModel esModel = new EsModel();
+            Integer inte = zfProperty.getId().intValue();
+            String uuid = UUID.randomUUID().toString().replace("-","");
+            esModel.setId(uuid);
+            esModel.setCtId(Long.valueOf(inte));
+            esModel.setCtTableName("瀹跺涵璧勪骇");
+            esModel.setBy1(zfProperty.getType());
+            esModel.setBy2(zfProperty.getTitle());
+            esModel.setBy3(zfProperty.getLocation());
+            esModel.setBy4(zfProperty.getHolder());
+            esModel.setBy5("/family/zfProperty");
+            esModel.setBy6(zfProperty.getAddress());
+            esModel.setRemark(zfProperty.getRemark());
+            //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+            esService.insertTable(esModel);
+            
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
 
 
-        return AjaxResult.success(data);
+
+    @Resource
+    ZfLogService zfLogService;
+
+    @Override
+    public AjaxResult updateData(ZfProperty zfProperty) {
+        ZInfoUser myself = zInfoUserService.getMyself();
+
+        Long familyId = myself.getFamilyId();
+      //  System.out.println("sssssssssssss");
+        //鍏堟牴鎹甶d鏌ヨ鍑烘暟鎹殑familyId锛岀湅鐪嬫湁娌℃湁鏉冮檺鎿嶄綔
+        Long dataFamilyId = getById(zfProperty.getId()).getFamilyId();
+
+        List<ZAuthority> authority = zAuthorityService.getAuthority();
+        List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(PROPERTY_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(zfProperty)){
+            //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+            ZfProperty dataById = getById(zfProperty.getId());
+            //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
+            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵璧勪骇");
+            if (esResult == null){
+                return AjaxResult.success();
+            }
+
+            //鎿嶄綔es淇敼鏁版嵁
+            EsModel newModel = new EsModel();
+            if(zfProperty.getType()!=null){
+                newModel.setBy1(zfProperty.getType());
+            }else {
+                newModel.setBy1(dataById.getType());
+            }
+
+            if(zfProperty.getTitle()!=null){
+                newModel.setBy2(zfProperty.getTitle());
+            }else {
+                newModel.setBy2(dataById.getTitle());
+            }
+
+            if(zfProperty.getLocation()!=null){
+                newModel.setBy3(zfProperty.getLocation());
+            }else {
+                newModel.setBy3(dataById.getLocation());
+            }
+
+            if(zfProperty.getHolder()!=null){
+                newModel.setBy4(zfProperty.getHolder());
+            }else {
+                newModel.setBy4(dataById.getHolder());
+            }
+
+            if(zfProperty.getAddress()!=null){
+                newModel.setBy6(zfProperty.getAddress());
+            }else {
+                newModel.setBy6(dataById.getAddress());
+            }
+            
+            if(zfProperty.getRemark()!=null){
+                newModel.setRemark(zfProperty.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(),
+                    "by6",newModel.getBy6(),
+                    "remark",newModel.getRemark()
+            );
+            try {
+                restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.error();
+        }
 
     }
+
+    @Override
+    @Transactional
+    public AjaxResult deleteData(Long[] ids) {
+        List<ZfProperty> dataList = zfPropertyService.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(PROPERTY_LIST_REMOVE)).map(ZAuthority::getFid).collect(Collectors.toList());
+        familyIdList.add(familyId);
+
+        for (ZfProperty data : dataList) {
+            if (!familyIdList.contains(data.getFamilyId())){
+                throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+            }
+            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(data.getId().longValue(),2007L);
+            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
+                return AjaxResult.error();
+
+        }
+
+        List<ZfProperty> zfPropertys = listByIds(Arrays.asList(ids));
+
+        if (! (zfPropertyDownloadService.deleteData(ids) && iZfPropertyShareService.deleteByContentId(ids))){
+            return AjaxResult.error();
+        }
+        if (zfPropertyService.removeByIds(Arrays.asList(ids))) {
+
+            //鍒犻櫎es涓殑鏁版嵁
+            zfPropertys.stream().forEach(zfProperty -> {
+                EsModel esModel = esService.findByCtId(zfProperty.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);
+                }}
+            });
+            System.out.println("15165132165346153246153");
+
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.error();
+        }
+
+    }
+
+//    @Override
+//    public AjaxResult addData2(ZfProperty zfProperty) {
+//        ZInfoUser mySelf = getMySelf();
+//        String myFamilyId = mySelf.getFamilyId();
+//
+//        if (StringUtils.isNotEmpty(zfProperty.getFamilyId())) {
+//            throw new RuntimeException("瀵煎叆鏁版嵁鏃舵偍涓嶈兘鎸囧畾瀹跺涵鍙�");
+//        }
+//
+//        if (StringUtils.isEmpty(myFamilyId)) {
+//            throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
+//        }
+//
+//        if (myFamilyId.contains(",")) {
+//            String[] myFamilyIds = myFamilyId.split(",");
+//            //榛樿娣诲姞绗竴涓搴殑鏁版嵁
+//            zfProperty.setFamilyId(myFamilyIds[0]);
+//        } else {
+//            zfProperty.setFamilyId(myFamilyId);
+//        }
+//
+//        //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+//        LambdaQueryWrapper<ZfProperty> lqw = uniqueCondition(zfProperty);
+//        List<ZfProperty> list = list(lqw);
+//        if(list.size()>0){
+//            throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+//        }
+//
+//        if (save(zfProperty)) {
+//            return AjaxResult.success();
+//        } else {
+//            return AjaxResult.error();
+//        }
+//    }
+
+    private LambdaQueryWrapper<ZfProperty> uniqueCondition(ZfProperty zfProperty) {
+        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(!StringUtils.isEmpty(zfProperty.getType()), ZfProperty::getType, zfProperty.getType())
+                .eq(zfProperty.getFamilyId()!=null,ZfProperty::getFamilyId,zfProperty.getFamilyId())
+                .eq(!StringUtils.isEmpty(zfProperty.getTitle()), ZfProperty::getTitle, zfProperty.getTitle())
+                .eq(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
+                .eq(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
+                .eq(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
+                .eq(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
+                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime());
+        return lqw;
+
+    }
+
+    @Override
+    @Transactional
+    public AjaxResult importExcel(MultipartFile file) {
+        ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
+        List<ZfProperty> propertyList = null;
+        try {
+            propertyList = util.importExcel(file.getInputStream());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        log.info("璧勪骇鍒楄〃涓猴細{}", propertyList);
+
+        for (ZfProperty zfProperty : propertyList) {
+            zfPropertyService.addData(zfProperty);
+        }
+
+        return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
+
+    }
+
+    @Override
+    public AjaxResult listType() {
+        List<String> result = zfPropertyMapper.listType();
+        return AjaxResult.success(result);
+    }
+
 }
 
 

--
Gitblit v1.9.1