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 | 181 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 166 insertions(+), 15 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 9294d66..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
@@ -1,30 +1,25 @@
package com.ruoyi.service.impl;
-import com.alibaba.fastjson2.JSONObject;
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;
import com.ruoyi.common.core.domain.entity.EsModel;
-import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfEvent;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.service.*;
-import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -47,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;
@@ -62,17 +57,65 @@
private EsService esSer;
@Resource
+ private ZfEventDownloadService zfEventDownloadService;
+
+ @Resource
+ private ZfEventShareService zfEventShareService;
+
+ @Resource
private RestHighLevelClient restHighLevelClient;
private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent,List<Long> familyIdList) {
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;
}
@@ -214,17 +257,45 @@
// String secondFamilyIds = listSecondFamilyIds();
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ System.out.println("================");
+
Long familyId = myself.getFamilyId();
+
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+ Long motherFaId = 0L;
+ if(myself.getMomId()!=null)
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
+
//涔熻鏌ュ埆浜烘巿鏉冪殑
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);
+
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent, idList);
List<ZfEvent> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyId, beanRecords);
+ return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
}
@Override
@@ -237,10 +308,10 @@
return list;
}
- public List<ZfEvent> markOwnData(Long familyId,List<ZfEvent> beanRecords){
+ public List<ZfEvent> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEvent> beanRecords){
return beanRecords.stream().peek(
bean -> {
- if (bean.getFamilyId() == familyId) {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
bean.setOwnData(1);
} else {
bean.setOwnData(0);
@@ -277,11 +348,34 @@
return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
}
Long familyId = myself.getFamilyId();
+ System.out.println("++++++++++++++++");
+ System.out.println(familyId);
+ System.out.println(myself.getFatherId());
+ System.out.println(zInfoUserService.getInfoById(myself.getFatherId()));
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+ Long motherFaId = 0L;
+ if(myself.getMomId()!=null)
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
+
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+
+ //鍔犱笂鐖舵瘝瀹舵棌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);
+ }
+
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds();
LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);
@@ -292,7 +386,9 @@
List<ZfEvent> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
- List<ZfEvent> dtoResult = markOwnData(familyId, beanRecords);
+ System.out.println(beanRecords);
+ System.out.println(beanRecords.size());
+ List<ZfEvent> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
@@ -540,9 +636,11 @@
}
List<ZfEvent> zfEvents = listByIds(Arrays.asList(ids));
+ if (! (zfEventDownloadService.deleteData(ids) && zfEventShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
if (zfEventService.removeByIds(Arrays.asList(ids))) {
-
//鍒犻櫎es涓殑鏁版嵁
zfEvents.stream().forEach(zfEvent -> {
EsModel esModel = esSer.findByCtId(zfEvent.getId(), "瀹跺ぇ浜嬭");
@@ -556,6 +654,7 @@
}
});
+
return AjaxResult.success();
}else {
return AjaxResult.error();
@@ -564,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