修改了bug

feige

2024-10-25 81995abfa712d65b7f7f1e23b97a97bc4065103d

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

@@ -6,17 +6,13 @@
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;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfEconomy;
import com.ruoyi.domain.ZfEconomy;
import com.ruoyi.mapper.ZfEconomyMapper;
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;
@@ -62,6 +58,12 @@

    @Resource
    RestHighLevelClient restHighLevelClient;

    @Resource
    ZfEconomyShaService zfEconomyShaService;

    @Resource
    ZfEconomyDownlService zfEconomyDownlService;

    private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
@@ -225,17 +227,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(ECONOMY_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

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

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

    @Override
@@ -284,12 +300,31 @@

        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        if(myself==null)
        {
            //   System.out.println("ssssss");
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();

        //查看父母的数据：
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
        Long motherFaId = 0L;
        if(myself.getMomId()!=null)
            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();

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

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

//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfEconomy> lqw = buildCondition(zfEconomy, idList);
@@ -300,16 +335,16 @@

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

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

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

    public List<ZfEconomy> markOwnData(Long familyId,List<ZfEconomy> beanRecords){
    public List<ZfEconomy> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEconomy> 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);
@@ -460,6 +495,10 @@
            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "家庭收支台账");

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

            //操作es修改数据
            EsModel newModel = new EsModel();
            if(zfEconomy.getUseFor()!=null){
@@ -516,17 +555,23 @@
            }
        }
        List<ZfEconomy> zfEconomys = listByIds(Arrays.asList(ids));

        if (! (zfEconomyDownlService.deleteData(ids) && zfEconomyShaService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        if (zfEconomyService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
            zfEconomys.stream().forEach(zfEconomy -> {
                EsModel esModel = esService.findByCtId(zfEconomy.getId().intValue(), "家庭收支台账");
                DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
                try {
                    restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
                } catch (IOException e) {
                    throw new RuntimeException(e);

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