From 3eb37463a952fb69d586769ca660886b956cb016 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 12:24:40 +0800
Subject: [PATCH] 人物搜索 新加所有家族模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 121 +++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 9 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index 7f54cf3..080b075 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/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;
}
@@ -240,7 +283,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();
@@ -251,7 +294,11 @@
//鍔犱笂鐖舵瘝鐨刬d
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<ZfClean> lambdaQueryWrapper = buildCondition(zfClean, idList);
List<ZfClean> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
@@ -289,7 +336,7 @@
public List<ZfClean> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfClean> 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);
@@ -340,6 +387,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<ZfClean> lqw = buildCondition(zfClean, idList);
@@ -432,8 +484,8 @@
esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
-
-
+
+
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -637,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;
+ }
+
}
--
Gitblit v1.9.1