修改了bug

feige

2024-10-25 81995abfa712d65b7f7f1e23b97a97bc4065103d

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

@@ -1,10 +1,13 @@
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.core.domain.entity.SysUser;

import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -13,18 +16,22 @@
import com.ruoyi.constant.MenuAuthority;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.IZfPropertyService;
import com.ruoyi.service.ZAuthorityService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.*;
import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.update.UpdateRequest;
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.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

@@ -51,6 +58,18 @@

    @Resource
    ZfPropertyMapper zfPropertyMapper;
    
    @Resource
    EsService esService;
    
    @Resource
    RestHighLevelClient restHighLevelClient;

    @Resource
    private IZfPropertyDownloadService zfPropertyDownloadService;

    @Resource
    private IZfPropertyShareService iZfPropertyShareService;


//    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
@@ -211,17 +230,31 @@
        //要查自己家庭的
        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(PROPERTY_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<ZfProperty> lqw = buildCondition(zfProperty, idList);
        List<ZfProperty> beanRecords = list(lqw);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyId, beanRecords);
        return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);
    }

//    private static List<ZfProperty> markOwnData(String familyIds, List<ZfProperty> beanRecords) {
@@ -247,12 +280,31 @@

        //要查自己家庭的
        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);

//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, idList);
@@ -262,22 +314,22 @@

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

        List<ZfProperty> dtoResult = markOwnData(familyId, beanRecords);
        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,List<ZfProperty> beanRecords){
    public List<ZfProperty> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfProperty> beanRecords){
        return beanRecords.stream().peek(
                bean -> {
                    if (bean.getFamilyId() == familyId) {
                    if (bean.getFamilyId() == familyId||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
                        bean.setOwnData(1);
                    } else {
                        bean.setOwnData(0);
                    }
                }
        ).collect(Collectors.toList());
        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
    }

    @Override
@@ -288,6 +340,12 @@
        else
            list = list();
        return list;
    }

    @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
@@ -376,17 +434,38 @@
        }

        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();

        Long familyId = myself.getFamilyId();
      //  System.out.println("sssssssssssss");
        //先根据id查询出数据的familyId，看看有没有权限操作
        Long dataFamilyId = getById(zfProperty.getId()).getFamilyId();

@@ -398,7 +477,75 @@
            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();
@@ -424,7 +571,27 @@
            }
        }

        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();