用户修改姓名和电话同步修改uaid

zqy

5 天以前 b02beccf4567068cb47a3f1181a00039456c872d

 zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java

@@ -1,26 +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.core.domain.entity.EsModel;

import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.IZfPropertyService;
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 java.text.ParseException;
import java.text.SimpleDateFormat;
import javax.annotation.Resource;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

import static com.ruoyi.constant.MenuAuthority.*;


/**
@@ -32,37 +40,648 @@
@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();
//
//        //处理传入的secondFamilyAuthority   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);
//                }
//            }
//        }
//        //将StringBuffer转成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);
        List<ZfProperty> list = list(lambdaQueryWrapper);
        log.info("返回的数据为:{}",list);
        //要查自己家庭的
        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());
        //加上自己家庭的id
        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 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();

        //加上自己家庭的id
        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 List<ZfProperty> selectByIds(Long[] ids) {
        List<ZfProperty> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    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;
    @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);
    }

    @Override
    public AjaxResult selectPropertyList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
    public List<ZfProperty> selectByFamilyIds(Long[] familyIds) {
        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
        lqw.in(ZfProperty::getFamilyId,familyIds);
        return list(lqw);
    }

        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
//    @Override
//    public AjaxResult addData(ZfProperty zfProperty) {
//
//        String familyIds = listFamilyIds();
//        boolean flag = false;//判断当前用户的id是否有权加入当前家庭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() + "数据的权限");
//        }
//    }

        Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
        Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
//    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;
//    }

        HashMap<String, Object> data = MapUtils.getResult(pageResult);
        return AjaxResult.success(data);
    @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("你没有权限操作此家庭的数据");
        }


        if(zfProperty.getFamilyId() == null){
            //默认添加自己家庭的数据
            zfProperty.setFamilyId(familyId);
        }

        //判断是否有重复数据
        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();
        }
    }



    @Resource
    ZfLogService zfLogService;

    @Override
    public AjaxResult updateData(ZfProperty zfProperty) {
        ZInfoUser myself = zInfoUserService.getMyself();

        Long familyId = myself.getFamilyId();
      //  System.out.println("sssssssssssss");
        //先根据id查询出数据的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中查询到对应那条数据在es的id
            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);
    }

}