人物搜索 新加所有家族模块

zqy

3 天以前 3eb37463a952fb69d586769ca660886b956cb016

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -11,6 +12,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
@@ -38,7 +40,7 @@
 */
@Slf4j
@Service
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService,ModuleSearchable  {

    @Resource
    IZfPropertyService zfPropertyService;
@@ -51,10 +53,10 @@

    @Resource
    ZfPropertyMapper zfPropertyMapper;
    

    @Resource
    EsService esService;
    

    @Resource
    RestHighLevelClient restHighLevelClient;

@@ -92,10 +94,48 @@
                .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)
                .in(familyIdList!=null,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);


        if (StringUtils.isNotEmpty(zfProperty.getIsHide())) {

            lqw.and(wrapper -> wrapper
                .ne(ZfProperty::getIsHide, "是")
                .or()
                .isNull(ZfProperty::getIsHide)
            );
        }
        if (zfProperty.getHasAttachment() != null && zfProperty.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }
//        lqw.in(StringUtils.isNotEmpty(zfEconomy.getCompanionList()),ZfEconomy::getCompanion,zfEconomy.getCompanionList());
//        if (zfEconomy.getYear() != 0) {
//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfEconomy.getYear());
//            lqw.apply("YEAR(happen_time) = {0}", zfEconomy.getYear());
//        }

        if (CollectionUtils.isNotEmpty(zfProperty.getCompanionList())) {
            List<String> companionList = zfProperty.getCompanionList();

            // 清理和去重
            companionList = companionList.stream()
                .map(String::trim)
                .filter(s -> !s.isEmpty())
                .distinct()
                .collect(Collectors.toList());

            if (!companionList.isEmpty()) {
                // 确保所有参与人都在companion字段中
                for (String companion : companionList) {
                    lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(companion, ' ', ''), '，', ',')) > 0",
                        companion);
                }
            }
        }
        System.out.println("查询条件: " + lqw.getCustomSqlSegment());
        return lqw;

    }
@@ -233,7 +273,7 @@
            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
        Long motherFaId = 0L;
        if(myself.getMomId()!=null)
            motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -244,7 +284,11 @@
        //加上父母家族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);
@@ -300,7 +344,11 @@
        //加上父母家族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);
@@ -319,7 +367,7 @@
    public List<ZfProperty> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfProperty> beanRecords){
        return beanRecords.stream().peek(
                bean -> {
                    if (bean.getFamilyId() == familyId||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
                    if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
                        bean.setOwnData(1);
                    } else {
                        bean.setOwnData(0);
@@ -446,12 +494,14 @@
            esModel.setRemark(zfProperty.getRemark());
            //这里存储查询详情的路径
            esService.insertTable(esModel);
            

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



    @Resource
    ZfLogService zfLogService;
@@ -520,7 +570,7 @@
            }else {
                newModel.setBy6(dataById.getAddress());
            }
            

            if(zfProperty.getRemark()!=null){
                newModel.setRemark(zfProperty.getRemark());
            }else {
@@ -674,6 +724,55 @@
        return AjaxResult.success(result);
    }

    @Override
    public String getModuleCode() {
        return "家产";
    }

    @Override
//    @Cacheable(value = "economy_search", key = "T(String).format('2045_%s_%s_%s_%s',#companion != null ? #companion : 'null',#happenStartTime != null ? #happenStartTime.getTime() : 0,#happenEndTime != null ? #happenEndTime.getTime() : 0,#hasAttachment != null ? #hasAttachment : 'null')")
    public List<?>  search(String companion, Date happenStartTime,Date happenEndTime,String hasAttachment) {
        ZfProperty zfProperty = new ZfProperty();
        zfProperty.setCompanion(companion);
        zfProperty.setHappenStartTime(happenStartTime);
        zfProperty.setHappenEndTime(happenEndTime);

        String[] split = companion.trim().replace(" ", "").replace("，", ",").split(",");
        List<String> list = Arrays.asList(split);

        zfProperty.setCompanionList(list);
        zfProperty.setHasAttachment(hasAttachment);
        zfProperty.setIsHide("否");


        return dataList(zfProperty);
    }

    public List<zfEventdto> dataList(ZfProperty zfProperty) {

        LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, null);

        List<ZfProperty> beanRecords = list(lqw);



        return encapData(beanRecords);
    }

    public List<zfEventdto> encapData(List<ZfProperty> lis)
    {
        List<zfEventdto> daoRes = new ArrayList<>() ;
        for(ZfProperty obj : lis)
        {
            zfEventdto atd = new zfEventdto();
            atd.setId(Math.toIntExact(obj.getId()));
            atd.setModule("家产");
            atd.setName(obj.getCompanion());
            atd.setCreateTime(obj.getCreateTime());
            daoRes.add(atd);
        }
        return daoRes;
    }
}