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

zqy

3 天以前 3eb37463a952fb69d586769ca660886b956cb016

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

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


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -9,6 +10,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.ZfPetMapper;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
@@ -33,7 +35,7 @@
 */
@Service
@Slf4j
public class ZfPetServiceImpl extends ServiceImpl<ZfPetMapper, ZfPet> implements ZfPetService {
public class ZfPetServiceImpl extends ServiceImpl<ZfPetMapper, ZfPet> implements ZfPetService,ModuleSearchable {

    @Autowired
    ZInfoUserService zInfoUserService;
@@ -43,7 +45,7 @@

    @Autowired
    ZfPetService zfPetService;
    

    @Resource
    ZAuthorityService zAuthorityService;

@@ -91,7 +93,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<ZfPet> lqw = buildCondition(zfPet, idList);
@@ -121,7 +127,7 @@
    }


    


    @Override
    public List<ZfPet> selectByCondition(ZfPet zfPet) {
@@ -151,7 +157,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);
        }
        LambdaQueryWrapper<ZfPet> lambdaQueryWrapper = buildCondition(zfPet, idList);
        List<ZfPet> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
@@ -348,7 +358,7 @@
    private LambdaQueryWrapper<ZfPet> buildCondition(ZfPet zfPet,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfPet> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfPet::getCreateTime);
        lqw.in(ZfPet::getFamilyId,familyIdList);
        lqw.in(familyIdList != null, ZfPet::getFamilyId,familyIdList);
        lqw.eq(zfPet.getId()!=null,ZfPet::getId,zfPet.getId());
        lqw.like(StringUtils.isNotEmpty(zfPet.getIdNum()),ZfPet::getIdNum,zfPet.getIdNum());
        lqw.like(StringUtils.isNotEmpty(zfPet.getSecurityCode()),ZfPet::getSecurityCode,zfPet.getSecurityCode());
@@ -365,6 +375,93 @@
        lqw.like(StringUtils.isNotEmpty(zfPet.getDialect()),ZfPet::getDialect,zfPet.getDialect());
        lqw.like(StringUtils.isNotEmpty(zfPet.getDisEatHabit()),ZfPet::getDisEatHabit,zfPet.getDisEatHabit());
        lqw.like(StringUtils.isNotEmpty(zfPet.getDisLifeHabit()),ZfPet::getDisLifeHabit,zfPet.getDisLifeHabit());
        return lqw;
    }
}


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

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

        if (CollectionUtils.isNotEmpty(zfPet.getCompanionList())) {
            List<String> companionList = zfPet.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);
                }
            }
        }

        return lqw;}


        @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) {
            ZfPet zfPet = new ZfPet();
            zfPet.setCompanion(companion);


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

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

            System.out.println("[[[[[[[["+zfPet);

            return dataList(zfPet);
        }

        public List<zfEventdto> dataList(ZfPet zfPet) {

            LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet, null);

            List<ZfPet> beanRecords = list(lqw);



            return encapData(beanRecords);
        }

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