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

zqy

3 天以前 3eb37463a952fb69d586769ca660886b956cb016

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.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;
@@ -12,6 +13,7 @@
import com.ruoyi.domain.*;

import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfCleanMapper;
import com.ruoyi.service.*;

@@ -42,7 +44,7 @@
 */
@Service
@Slf4j
public class ZfCleanServiceImpl extends ServiceImpl<ZfCleanMapper, ZfClean> implements ZfCleanService {
public class ZfCleanServiceImpl extends ServiceImpl<ZfCleanMapper, ZfClean> implements ZfCleanService,ModuleSearchable {

    @Resource
    ZInfoUserService zInfoUserService;
@@ -55,10 +57,10 @@

    @Resource
    ZfLogService zfLogService;
    

    @Resource
    EsService esService;
    

    @Resource
    RestHighLevelClient restHighLevelClient;

@@ -80,8 +82,49 @@
                .like(StringUtils.isNotEmpty(zfClean.getLocation()), ZfClean::getLocation, zfClean.getLocation())
                .like(StringUtils.isNotEmpty(zfClean.getRemark()), ZfClean::getRemark, zfClean.getRemark())
                .eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime())
                .in(ZfClean::getFamilyId,familyIdList)
                .in(familyIdList != null,ZfClean::getFamilyId,familyIdList)
                .between(zfClean.getHappenStartTime() != null && zfClean.getHappenEndTime() != null, ZfClean::getHappenTime, zfClean.getHappenStartTime(), zfClean.getHappenEndTime());
        if (StringUtils.isNotEmpty(zfClean.getIsHide())) {

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

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




        lqw.eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime());

        return lqw;
    }

@@ -441,8 +484,8 @@
            esModel.setFid(familyId);
            //这里存储查询详情的路径
            esService.insertTable(esModel);
            
            


            return AjaxResult.success();
        } else {
            return AjaxResult.error();
@@ -646,4 +689,55 @@
    }


    @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) {
        ZfClean zfClean = new ZfClean();
        zfClean.setCompanion(companion);
        zfClean.setHappenStartTime(happenStartTime);
        zfClean.setHappenEndTime(happenEndTime);

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

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

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

        return dataList(zfClean);
    }

    public List<zfEventdto> dataList(ZfClean zfClean) {

        LambdaQueryWrapper<ZfClean> lqw = buildCondition(zfClean, null);

        List<ZfClean> beanRecords = list(lqw);



        return encapData(beanRecords);
    }

    public List<zfEventdto> encapData(List<ZfClean> lis)
    {
        List<zfEventdto> daoRes = new ArrayList<>() ;
        for(ZfClean 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;
    }

}