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/ZfEventServiceImpl.java | 123 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index 3f89e2c..33cf325 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.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.ZfEvent;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
@@ -40,7 +42,7 @@
*/
@Slf4j
@Service
-public class ZfEventServiceImpl extends ServiceImpl<ZfEventMapper, ZfEvent> implements ZfEventService {
+public class ZfEventServiceImpl extends ServiceImpl<ZfEventMapper, ZfEvent> implements ZfEventService,ModuleSearchable {
@Resource
ZInfoUserService zInfoUserService;
@@ -66,12 +68,54 @@
LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfEvent::getCreateTime);
lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()), ZfEvent::getAddress, zfEvent.getAddress());
- lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople());
lqw.like(!StringUtils.isEmpty(zfEvent.getTitle()), ZfEvent::getTitle, zfEvent.getTitle());
lqw.like(!StringUtils.isEmpty(zfEvent.getRemark()), ZfEvent::getRemark, zfEvent.getRemark());
lqw.eq(zfEvent.getHappenTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenTime());
- lqw.in(ZfEvent::getFamilyId,familyIdList);
+ lqw.in(familyIdList != null, ZfEvent::getFamilyId,familyIdList);
lqw.between(zfEvent.getHappenStartTime() != null && zfEvent.getHappenEndTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenStartTime(), zfEvent.getHappenEndTime());
+
+ if (StringUtils.isNotEmpty(zfEvent.getIsHide())) {
+
+ lqw.and(wrapper -> wrapper
+ .ne(ZfEvent::getIsHide, "鏄�")
+ .or()
+ .isNull(ZfEvent::getIsHide)
+ );
+ }else {
+ lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople());
+
+ }
+ if (zfEvent.getHasAttachment() != null && zfEvent.getHasAttachment().equals("鏄�")) {
+ lqw.apply("url IS NOT NULL AND url != ''");
+ }
+// lqw.in(StringUtils.isNotEmpty(ZfEvent.getCompanionList()),ZfEvent::getCompanion,ZfEvent.getCompanionList());
+// if (ZfEvent.getYear() != 0) {
+// System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+ZfEvent.getYear());
+// lqw.apply("YEAR(happen_time) = {0}", ZfEvent.getYear());
+// }
+
+ if (CollectionUtils.isNotEmpty(zfEvent.getCompanionList())) {
+ List<String> companionList = zfEvent.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(people, ' ', ''), '锛�', ',')) > 0",
+ companion);
+ }
+ }
+ }
+ lqw.eq(zfEvent.getHappenTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenTime());
+ System.out.println("鏌ヨ鏉′欢: " + lqw.getCustomSqlSegment());
+
return lqw;
}
@@ -228,6 +272,18 @@
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+
+
+ //鏍规嵁uaid鏌ヨ鐩稿悓鍚嶅瓧涓嬪埆鐨勫搴噷鑷繁鐨勬暟鎹�
+ // Long fmid;
+ System.out.println(myself.getUaid());
+
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ System.out.println("[[[[[[[[[[[}}}}}}}}}}}}}}}}}}");
+ idList.addAll(fms);
+ }
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
System.out.println(authority);
@@ -255,7 +311,7 @@
public List<ZfEvent> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEvent> 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);
@@ -313,8 +369,13 @@
//鍔犱笂鐖舵瘝瀹舵棌id
idList.add(fatherFaId);
idList.add(motherFaId);
+ // System.out.println(myself.getUaid());
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ idList.addAll(fms);
+ }
- System.out.println(idList.size());
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds();
LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);
@@ -602,4 +663,56 @@
}
+ @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) {
+ ZfEvent zfEvent = new ZfEvent();
+ zfEvent.setPeople(companion);
+ zfEvent.setHappenStartTime(happenStartTime);
+ zfEvent.setHappenEndTime(happenEndTime);
+
+ System.out.println("--------------"+companion+"-----------------");
+ String[] split = companion.trim().replace(" ", "").replace("锛�", ",").split(",");
+ List<String> list = Arrays.asList(split);
+
+ zfEvent.setCompanionList(list);
+ zfEvent.setHasAttachment(hasAttachment);
+ zfEvent.setIsHide("鍚�");
+
+ System.out.println("[[[[[[[["+zfEvent);
+
+ return dataList(zfEvent);
+ }
+
+ public List<zfEventdto> dataList(ZfEvent zfEvent) {
+
+ LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, null);
+
+ List<ZfEvent> beanRecords = list(lqw);
+
+
+
+ return encapData(beanRecords);
+ }
+
+ public List<zfEventdto> encapData(List<ZfEvent> lis)
+ {
+ List<zfEventdto> daoRes = new ArrayList<>() ;
+ for(ZfEvent obj : lis)
+ {
+ zfEventdto atd = new zfEventdto();
+ atd.setId(Math.toIntExact(obj.getId()));
+ atd.setModule("瀹剁邯");
+ atd.setName(obj.getPeople());
+ atd.setCreateTime(obj.getCreateTime());
+ daoRes.add(atd);
+ }
+ return daoRes;
+ }
+
}
--
Gitblit v1.9.1