修改了bug

feige

2024-10-25 81995abfa712d65b7f7f1e23b97a97bc4065103d

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

@@ -5,30 +5,30 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.EsModel;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfCollection;
import com.ruoyi.domain.ZfCollection;
import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfCollection;
import com.ruoyi.mapper.ZfCollectionMapper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfCollectionService;
import com.ruoyi.util.ArraysUtil;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

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

/**
 * <p>
@@ -48,8 +48,30 @@
    @Resource
    ZInfoUserService zInfoUserService;

    private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection) {
    @Resource
    ZAuthorityService zAuthorityService;

    @Resource
    ZfCollectionMapper zfCollectionMapper;

    @Resource
    ZfLogService zfLogService;

    @Resource
    EsService esService;

    @Resource
    RestHighLevelClient restHighLevelClient;

    @Resource
    ZfCollectionShareService zfCollectionShareService;

    @Resource
    ZfCollectionDownloadService zfCollectionDownloadService;

    private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfCollection::getCreateTime);
        lqw.like(StringUtils.isNotEmpty(zfCollection.getType()),ZfCollection::getType,zfCollection.getType());
        lqw.like(StringUtils.isNotEmpty(zfCollection.getName()),ZfCollection::getName,zfCollection.getName());
        lqw.like(StringUtils.isNotEmpty(zfCollection.getSource()),ZfCollection::getSource,zfCollection.getSource());
@@ -57,206 +79,543 @@
        lqw.like(StringUtils.isNotEmpty(zfCollection.getPrice()),ZfCollection::getPrice,zfCollection.getPrice());
        lqw.like(StringUtils.isNotEmpty(zfCollection.getLocation()),ZfCollection::getLocation,zfCollection.getLocation());
        lqw.like(StringUtils.isNotEmpty(zfCollection.getRemark()),ZfCollection::getRemark,zfCollection.getRemark());
        lqw.in(ZfCollection::getFamilyId,familyIdList);
        lqw.eq(zfCollection.getHappenTime() != null, ZfCollection::getHappenTime, zfCollection.getHappenTime());
        lqw.between(zfCollection.getHappenStartTime() != null && zfCollection.getHappenEndTime() != null, ZfCollection::getHappenTime, zfCollection.getHappenStartTime(), zfCollection.getHappenEndTime());
        return lqw;
    }

    private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection, String familyIds, String secondFamilyAuthority) {
        //模糊查询的条件
        LambdaQueryWrapper<ZfCollection> lqw = buildCondition(zfCollection);

        //定义一个布尔标记，标记第一家庭号是否有逗号
        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(ZfCollection::getFamilyId, totalFamilyIdList);
                } else {
                    //如果第一家庭号没有逗号但是第二家庭号有逗号
                    String[] totalFamilyIdList = ArraysUtil.appendToArray(secondFamilyIdList, familyIds);
                    lqw.in(ZfCollection::getFamilyId, totalFamilyIdList);
                }

            } else {
                if (flag) {
                    //如果第一家庭号有逗号但第二家庭号没有逗号
                    String[] familyList = familyIds.split(",");
                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIds);
                    lqw.in(ZfCollection::getFamilyId, totalFamilyIdList);
                } else {
                    //如果第一家庭号和第二家庭号都没有逗号
                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyIds, secondFamilyIds);
                    lqw.in(ZfCollection::getFamilyId, totalFamilyIdList);
                }
            }
        } else {
            //如果没有第二家庭号
            if (flag) {
                String[] familyList = familyIds.split(",");
                lqw.in(ZfCollection::getFamilyId, familyList);
            } else {
                lqw.eq(ZfCollection::getFamilyId, familyIds);
            }

        }

        lqw.orderByDesc(ZfCollection::getCreateTime);
    private LambdaQueryWrapper<ZfCollection> uniqueCondition(ZfCollection zfCollection) {
        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
        lqw.eq(StringUtils.isNotEmpty(zfCollection.getType()),ZfCollection::getType,zfCollection.getType());
        lqw.eq(StringUtils.isNotEmpty(zfCollection.getName()),ZfCollection::getName,zfCollection.getName());
        lqw.eq(StringUtils.isNotEmpty(zfCollection.getSource()),ZfCollection::getSource,zfCollection.getSource());
        lqw.eq(StringUtils.isNotEmpty(zfCollection.getOwner()),ZfCollection::getOwner,zfCollection.getOwner());
        lqw.eq(StringUtils.isNotEmpty(zfCollection.getPrice()),ZfCollection::getPrice,zfCollection.getPrice());
        lqw.eq(StringUtils.isNotEmpty(zfCollection.getLocation()),ZfCollection::getLocation,zfCollection.getLocation());
        lqw.eq(StringUtils.isNotEmpty(zfCollection.getRemark()),ZfCollection::getRemark,zfCollection.getRemark());
        lqw.eq(zfCollection.getHappenTime() != null, ZfCollection::getHappenTime, zfCollection.getHappenTime());
        lqw.eq(zfCollection.getFamilyId()!=null,ZfCollection::getFamilyId,zfCollection.getFamilyId());
        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(COLLECTION_LIST)) {
                    secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
                    break;
                }
            }
        } else {
            if (authorities.equals(COLLECTION_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();
    }
//    private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection, String familyIds, String secondFamilyAuthority) {
//        //模糊查询的条件
//        LambdaQueryWrapper<ZfCollection> lqw = buildCondition(zfCollection);
//
//        //定义一个布尔标记，标记第一家庭号是否有逗号
//        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(ZfCollection::getFamilyId, totalFamilyIdList);
//                } else {
//                    //如果第一家庭号没有逗号但是第二家庭号有逗号
//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(secondFamilyIdList, familyIds);
//                    lqw.in(ZfCollection::getFamilyId, totalFamilyIdList);
//                }
//
//            } else {
//                if (flag) {
//                    //如果第一家庭号有逗号但第二家庭号没有逗号
//                    String[] familyList = familyIds.split(",");
//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyList, secondFamilyIds);
//                    lqw.in(ZfCollection::getFamilyId, totalFamilyIdList);
//                } else {
//                    //如果第一家庭号和第二家庭号都没有逗号
//                    String[] totalFamilyIdList = ArraysUtil.appendToArray(familyIds, secondFamilyIds);
//                    lqw.in(ZfCollection::getFamilyId, totalFamilyIdList);
//                }
//            }
//        } else {
//            //如果没有第二家庭号
//            if (flag) {
//                String[] familyList = familyIds.split(",");
//                lqw.in(ZfCollection::getFamilyId, familyList);
//            } else {
//                lqw.eq(ZfCollection::getFamilyId, familyIds);
//            }
//
//        }
//
//        lqw.orderByDesc(ZfCollection::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(COLLECTION_LIST)) {
//                    secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
//                    break;
//                }
//            }
//        } else {
//            if (authorities.equals(COLLECTION_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<ZfCollection> selectByCondition(ZfCollection zfCollection) {
        String familyIds = listFamilyIds();
        String secondFamilyIds = listSecondFamilyIds();
        LambdaQueryWrapper<ZfCollection> lambdaQueryWrapper = buildCondition(zfCollection, familyIds, secondFamilyIds);
//        String familyIds = listFamilyIds();
//        String secondFamilyIds = listSecondFamilyIds();
//        LambdaQueryWrapper<ZfCollection> lambdaQueryWrapper = buildCondition(zfCollection, familyIds, secondFamilyIds);
//        List<ZfCollection> 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.getInfoBysysId(myself.getMomId()).getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(COLLECTION_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);

        LambdaQueryWrapper<ZfCollection> lambdaQueryWrapper = buildCondition(zfCollection, idList);
        List<ZfCollection> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyIds, beanRecords);
        return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
    }

    private List<ZfCollection> markOwnData(String familyIds, List<ZfCollection> 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);
    @Override
    public List<ZfCollection> selectByIds(Long[] ids) {
        List<ZfCollection> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

//    private List<ZfCollection> markOwnData(String familyIds, List<ZfCollection> 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());
//    }

    public List<ZfCollection> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfCollection> beanRecords){
        return beanRecords.stream().peek(
                bean -> {
                    if (bean.getFamilyId() == familyId||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
                        bean.setOwnData(1);
                    } else {
                        bean.setOwnData(0);
                    }
                }
            } else {
                if (familyIds.equals(recordFamilyId)) {
                    record.setOwnData(1);
                }
            }
        }).collect(Collectors.toList());
        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
    }

    @Override
    public AjaxResult selectDataList(ZfCollection zfCollection, Integer pageNum, Integer pageSize) {
        String familyIds = listFamilyIds();
        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfCollection> lqw = buildCondition(zfCollection, familyIds, secondFamilyAuthority);
//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
//        LambdaQueryWrapper<ZfCollection> lqw = buildCondition(zfCollection, familyIds, secondFamilyAuthority);
//
//        Page<ZfCollection> zfCollectionPage = new Page<>(pageNum, pageSize);
//        Page<ZfCollection> pageResult = page(zfCollectionPage, lqw);
//
//        List<ZfCollection> beanRecords = pageResult.getRecords();//得到查询出来的数据
//
//        List<ZfCollection> 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(COLLECTION_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);

//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfCollection> lqw = buildCondition(zfCollection, idList);


        Page<ZfCollection> zfCollectionPage = new Page<>(pageNum, pageSize);
        Page<ZfCollection> pageResult = page(zfCollectionPage, lqw);

        List<ZfCollection> beanRecords = pageResult.getRecords();//得到查询出来的数据

        List<ZfCollection> dtoResult = markOwnData(familyIds, beanRecords);
        List<ZfCollection> dtoResult = markOwnData(familyId, fatherFaId, motherFaId,beanRecords);

        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
    }

    
//    @Override
//    public AjaxResult addData2(ZfCollection zfCollection){
//        ZInfoUser mySelf = getMySelf();
//        String myFamilyId = mySelf.getFamilyId();
//
//        if (StringUtils.isNotEmpty(zfCollection.getFamilyId())){
//            throw new RuntimeException("导入数据时您不能指定家庭号");
//        }
//
//        if(StringUtils.isEmpty(myFamilyId)){
//            throw new RuntimeException("您还未加入任何家庭");
//        }
//
//        if (myFamilyId.contains(",")){
//            String[] myFamilyIds = myFamilyId.split(",");
//            //默认添加第一个家庭的数据
//            zfCollection.setFamilyId(myFamilyIds[0]);
//        }else {
//            zfCollection.setFamilyId(myFamilyId);
//        }
//
//        //判断是否有重复数据
//        LambdaQueryWrapper<ZfCollection> lqw = uniqueCondition(zfCollection);
//        List<ZfCollection> list = list(lqw);
//        if(list.size()>0){
//            throw new RuntimeException("请勿新增重复数据");
//        }
//
//        if (save(zfCollection)) {
//            return AjaxResult.success();
//        }else {
//            return AjaxResult.error();
//        }
//    }

    @Override
    public AjaxResult addData2(ZfCollection zfCollection){
        ZInfoUser mySelf = getMySelf();
        String myFamilyId = mySelf.getFamilyId();
    public AjaxResult addData(ZfCollection zfCollection) {
        ZInfoUser myself = zInfoUserService.getMyself();
        Long familyId = myself.getFamilyId();

        if (StringUtils.isNotEmpty(zfCollection.getFamilyId())){
            throw new RuntimeException("导入数据时您不能指定家庭号");
        }

        if(StringUtils.isEmpty(myFamilyId)){
        if(familyId == null){
            throw new RuntimeException("您还未加入任何家庭");
        }

        if (myFamilyId.contains(",")){
            String[] myFamilyIds = myFamilyId.split(",");
            //默认添加第一个家庭的数据
            zfCollection.setFamilyId(myFamilyIds[0]);
        }else {
            zfCollection.setFamilyId(myFamilyId);
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(COLLECTION_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
        familyIdList.add(familyId);

        if (zfCollection.getFamilyId()!=null && !familyIdList.contains(zfCollection.getFamilyId())) {
            throw new RuntimeException("你没有权限操作此家庭的数据");
        }


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

        //判断是否有重复数据
        LambdaQueryWrapper<ZfCollection> lqw = uniqueCondition(zfCollection);
        List<ZfCollection> list = list(lqw);

        if(list.size()>0){
            throw new RuntimeException("请勿新增重复数据");
        }

        if (save(zfCollection)) {

            EsModel esModel = new EsModel();
            Integer inte = zfCollection.getId().intValue();
            String uuid = UUID.randomUUID().toString().replace("-","");
            esModel.setId(uuid);
            esModel.setCtId(Long.valueOf(inte));
            esModel.setCtTableName("收藏和荣誉");
            esModel.setBy1(zfCollection.getType());
            esModel.setBy2(zfCollection.getName());
            esModel.setBy3(zfCollection.getSource());
            esModel.setBy4(zfCollection.getOwner());
            esModel.setBy5("/family/zfCollection");
            esModel.setBy6(zfCollection.getLocation());
            esModel.setRemark(zfCollection.getRemark());
            esModel.setFid(familyId);
            //这里存储查询详情的路径
            esService.insertTable(esModel);

            return AjaxResult.success();
        } else {
            return AjaxResult.error();
        }

    }

    @Override
    public AjaxResult updateData(ZfCollection zfCollection) {
        ZInfoUser myself = zInfoUserService.getMyself();
        Long familyId = myself.getFamilyId();

        //先根据id查询出数据的familyId，看看有没有权限操作
        Long dataFamilyId = getById(zfCollection.getId()).getFamilyId();

        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(COLLECTION_LIST_UPDATE)).map(ZAuthority::getFid).collect(Collectors.toList());
        familyIdList.add(familyId);

        if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
            throw new RuntimeException("你没有权限操作此家庭的数据");
        }

        //先记录下谁更新、何时更新、更新了哪里

//        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
//        lqw.eq(ZfCollection::getId,zfCollection.getId());
//        zfCollectionService.getOne(lqw);
//        ZfCollection oldData = getOne(lqw);
//
//        String oldJson = JSONObject.toJSONString(oldData);
//        String newJson = JSONObject.toJSONString(zfCollection);
//
//        Map oldMap = JSONObject.parseObject(oldJson, Map.class);
//        Map newMap = JSONObject.parseObject(newJson, Map.class);
//
//        for (Object key : oldMap.keySet()) {
//            if(newMap.get(key)!=null && !newMap.get(key).equals(oldMap.get(key))){
//                System.out.println(newMap.get(key)+"     "+oldMap.get(key));
//                Date date = new Date();
//                System.out.println("用户"+myself.getNickName()+"在"+date+"这个时间"+"修改了<收藏荣誉>模块的"+key+"字段");
//            }
//        }

        //操作后加入日志
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("收藏荣誉");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);


        if(updateById(zfCollection)){

            //到数据库中查询对应的数据
            ZfCollection dataById = getById(zfCollection.getId());

            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "收藏和荣誉");

            if (esResult == null){
                return AjaxResult.success();
            }

            //操作es修改数据
            EsModel newModel = new EsModel();
            if(zfCollection.getType()!=null){
                newModel.setBy1(zfCollection.getType());
            }else {
                newModel.setBy1(dataById.getType());
            }

            if(zfCollection.getName()!=null){
                newModel.setBy2(zfCollection.getName());
            }else {
                newModel.setBy2(dataById.getName());
            }

            if(zfCollection.getSource()!=null){
                newModel.setBy3(zfCollection.getSource());
            }else {
                newModel.setBy3(dataById.getSource());
            }

            if(zfCollection.getOwner()!=null){
                newModel.setBy4(zfCollection.getOwner());
            }else {
                newModel.setBy4(dataById.getOwner());
            }

            if(zfCollection.getLocation()!=null){
                newModel.setBy6(zfCollection.getLocation());
            }else {
                newModel.setBy6(dataById.getLocation());
            }

            if(zfCollection.getRemark()!=null){
                newModel.setRemark(zfCollection.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
    public AjaxResult deleteData(Long[] ids) {
        List<ZfCollection> dataList = zfCollectionService.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(COLLECTION_LIST_REMOVE)).map(ZAuthority::getFid).collect(Collectors.toList());
        familyIdList.add(familyId);

        for (ZfCollection data : dataList) {
            if (!familyIdList.contains(data.getFamilyId())){
                throw new RuntimeException("你没有权限操作此家庭的数据");
            }
        }

        List<ZfCollection> zfCollections = listByIds(Arrays.asList(ids));
        if (! ( zfCollectionDownloadService.deleteData(ids) && zfCollectionShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        if (zfCollectionService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
            zfCollections.stream().forEach(zfCollection -> {
                EsModel esModel = esService.findByCtId(zfCollection.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 = zfCollectionMapper.listType();
        return AjaxResult.success(result);
    }


    @Override
    @Transactional
@@ -271,7 +630,7 @@
        log.info("准备要导入的数据列表为：{}", dataList);

        for (ZfCollection zfCollection : dataList) {
            zfCollectionService.addData2(zfCollection);
            zfCollectionService.addData(zfCollection);
        }

        return AjaxResult.success("导入数据成功");