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/ZfCollectionServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index a53bada..fef4e6b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.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;
@@ -11,6 +12,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfCollection;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfCollectionMapper;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
@@ -40,11 +42,11 @@
*/
@Service
@Slf4j
-public class ZfCollectionServiceImpl extends ServiceImpl<ZfCollectionMapper, ZfCollection> implements ZfCollectionService {
+public class ZfCollectionServiceImpl extends ServiceImpl<ZfCollectionMapper, ZfCollection> implements ZfCollectionService,ModuleSearchable {
@Resource
ZfCollectionService zfCollectionService;
-
+
@Resource
ZInfoUserService zInfoUserService;
@@ -79,9 +81,47 @@
lqw.like(StringUtils.isNotEmpty(zfCollection.getPrice()),ZfCollection::getPrice,zfCollection.getPrice());
lqw.like(StringUtils.isNotEmpty(zfCollection.getLocation()),ZfCollection::getLocation,zfCollection.getLocation());
lqw.like(StringUtils.isNotEmpty(zfCollection.getRemark()),ZfCollection::getRemark,zfCollection.getRemark());
- lqw.in(ZfCollection::getFamilyId,familyIdList);
+ lqw.in(familyIdList != null,ZfCollection::getFamilyId,familyIdList);
lqw.eq(zfCollection.getHappenTime() != null, ZfCollection::getHappenTime, zfCollection.getHappenTime());
lqw.between(zfCollection.getHappenStartTime() != null && zfCollection.getHappenEndTime() != null, ZfCollection::getHappenTime, zfCollection.getHappenStartTime(), zfCollection.getHappenEndTime());
+
+ if (StringUtils.isNotEmpty(zfCollection.getIsHide())) {
+
+ lqw.and(wrapper -> wrapper
+ .ne(ZfCollection::getIsHide, "鏄�")
+ .or()
+ .isNull(ZfCollection::getIsHide)
+ );
+ }
+ if (zfCollection.getHasAttachment() != null && zfCollection.getHasAttachment().equals("鏄�")) {
+ lqw.apply("url IS NOT NULL AND url != ''");
+ }
+// lqw.in(StringUtils.isNotEmpty(zfCollection.getCompanionList()),zfCollection::getCompanion,zfCollection.getCompanionList());
+// if (zfCollection.getYear() != 0) {
+// System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfCollection.getYear());
+// lqw.apply("YEAR(happen_time) = {0}", zfCollection.getYear());
+// }
+
+ if (CollectionUtils.isNotEmpty(zfCollection.getCompanionList())) {
+ List<String> companionList = zfCollection.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;
}
@@ -364,7 +404,7 @@
return AjaxResult.success(data);
}
-
+
// @Override
// public AjaxResult addData2(ZfCollection zfCollection){
// ZInfoUser mySelf = getMySelf();
@@ -645,4 +685,54 @@
}
+ @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) {
+ ZfCollection zfCollection = new ZfCollection();
+ zfCollection.setCompanion(companion);
+ zfCollection.setHappenStartTime(happenStartTime);
+ zfCollection.setHappenEndTime(happenEndTime);
+
+ String[] split = companion.split(",");
+ List<String> list = Arrays.asList(split);
+
+ zfCollection.setCompanionList(list);
+ zfCollection.setHasAttachment(hasAttachment);
+ zfCollection.setIsHide("鍚�");
+
+ System.out.println("[[[[[[[["+zfCollection);
+
+ return dataList(zfCollection);
+ }
+
+ public List<zfEventdto> dataList(ZfCollection zfCollection) {
+
+ LambdaQueryWrapper<ZfCollection> lqw = buildCondition(zfCollection, null);
+
+ List<ZfCollection> beanRecords = list(lqw);
+
+
+
+ return encapData(beanRecords);
+ }
+
+ public List<zfEventdto> encapData(List<ZfCollection> lis)
+ {
+ List<zfEventdto> daoRes = new ArrayList<>() ;
+ for(ZfCollection 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