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/ZfEconomyServiceImpl.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 92 insertions(+), 17 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 4ed3f1c..0e63b93 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.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.ZfEconomy;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfEconomyMapper;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
@@ -28,6 +30,7 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static com.ruoyi.constant.MenuAuthority.*;
@@ -70,7 +73,7 @@
private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfEconomy::getCreateTime);
- lqw.in(ZfEconomy::getFamilyId,familyIdList);
+ lqw.in(familyIdList != null, ZfEconomy::getFamilyId,familyIdList);
lqw.like(StringUtils.isNotEmpty(zfEconomy.getType()),ZfEconomy::getType,zfEconomy.getType());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getKind()),ZfEconomy::getKind,zfEconomy.getKind());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getPrice()),ZfEconomy::getPrice,zfEconomy.getPrice());
@@ -78,17 +81,53 @@
lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getBalance()),ZfEconomy::getBalance,zfEconomy.getBalance());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getRemark()),ZfEconomy::getRemark,zfEconomy.getRemark());
- lqw.like(StringUtils.isNotEmpty(zfEconomy.getCompanion()),ZfEconomy::getCompanion,zfEconomy.getCompanion());
+
+ if (StringUtils.isNotEmpty(zfEconomy.getIsHide())) {
+
+ lqw.and(wrapper -> wrapper
+ .ne(ZfEconomy::getIsHide, "鏄�")
+ .or()
+ .isNull(ZfEconomy::getIsHide)
+ );
+ }
+ if (zfEconomy.getHasAttachment() != null && zfEconomy.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(zfEconomy.getCompanionList())) {
+ List<String> companionList = zfEconomy.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(zfEconomy.getHappenTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenTime());
lqw.between(zfEconomy.getHappenStartTime() != null && zfEconomy.getHappenEndTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenStartTime(), zfEconomy.getHappenEndTime());
System.out.println("鏌ヨ鏉′欢: " + lqw.getCustomSqlSegment());
return lqw;
}
+
private LambdaQueryWrapper<ZfEconomy> uniqueCondition(ZfEconomy zfEconomy) {
LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
@@ -106,7 +145,7 @@
@Override
public List<ZfEconomy> change(){
ZfEconomy zfEconomy = new ZfEconomy();
- return list(buildCondition(zfEconomy,null));
+ return list(buildCondition(zfEconomy,null));
}
// private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy, String familyIds, String secondFamilyAuthority) {
@@ -365,13 +404,13 @@
public List<ZfEconomy> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEconomy> beanRecords){
return beanRecords.stream().peek(
- bean -> {
- if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
- bean.setOwnData(1);
- } else {
- bean.setOwnData(0);
- }
+ bean -> {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
+ bean.setOwnData(1);
+ } else {
+ bean.setOwnData(0);
}
+ }
).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
}
@@ -550,9 +589,9 @@
UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
updateRequest.doc(
- "by1",newModel.getBy1(),
- "by2",newModel.getBy2(),
- "remark",newModel.getRemark()
+ "by1",newModel.getBy1(),
+ "by2",newModel.getBy2(),
+ "remark",newModel.getRemark()
);
try {
@@ -617,20 +656,56 @@
@Override
public String getModuleCode() {
- return "2045";
+ return "鏀舵敮";
}
@Override
- @Cacheable(value = "economy_search", key = "T(String).format('2045_%s_%s_%s',#companion != null ? #companion : 'null',#happenStartTime != null ? #happenStartTime.getTime() : 0,#happenEndTime != null ? #happenEndTime.getTime() : 0)")
- public List<?> search(String companion, Date happenStartTime,Date happenEndTime) {
+// @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) {
ZfEconomy zfEconomy = new ZfEconomy();
zfEconomy.setCompanion(companion);
zfEconomy.setHappenStartTime(happenStartTime);
zfEconomy.setHappenEndTime(happenEndTime);
- System.out.println("ssssss"+zfEconomy);
- return selectByCondition(zfEconomy);
+
+ String[] split = companion.split(",");
+ List<String> list = Arrays.asList(split);
+
+ zfEconomy.setCompanionList(list);
+ zfEconomy.setHasAttachment(hasAttachment);
+ zfEconomy.setIsHide("鍚�");
+
+ System.out.println("[[[[[[[["+zfEconomy);
+
+ return dataList(zfEconomy);
}
+ public List<zfEventdto> dataList(ZfEconomy zfEconomy) {
+
+ LambdaQueryWrapper<ZfEconomy> lqw = buildCondition(zfEconomy, null);
+
+ List<ZfEconomy> beanRecords = list(lqw);
+
+
+
+ return encapData(beanRecords);
+ }
+
+ public List<zfEventdto> encapData(List<ZfEconomy> lis)
+ {
+ List<zfEventdto> daoRes = new ArrayList<>() ;
+ for(ZfEconomy 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;
+ }
+
+
@CacheEvict(value = "economy_search", allEntries = true)
public void clearAllCache() {
System.out.println("娓呴櫎鎵�鏈夌粡娴庢悳绱㈢紦瀛�");
--
Gitblit v1.9.1