From 77088e55cec8b6f83f8396d6609ff4f57b4807b5 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 10:05:32 +0800
Subject: [PATCH] 人物搜索 新加了两个模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 262 insertions(+), 23 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 58ca470..35bdb22 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,32 +2,35 @@
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.SysUser;
+import com.ruoyi.common.core.domain.entity.EsModel;
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.ZfEconomy;
-import com.ruoyi.domain.ZfEconomy;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfEconomyMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfEconomyService;
-import com.ruoyi.util.ArraysUtil;
+import com.ruoyi.service.*;
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.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+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.*;
@@ -42,7 +45,7 @@
*/
@Service
@Slf4j
-public class ZfEconomyServiceImpl extends ServiceImpl<ZfEconomyMapper, ZfEconomy> implements ZfEconomyService {
+public class ZfEconomyServiceImpl extends ServiceImpl<ZfEconomyMapper, ZfEconomy> implements ZfEconomyService,ModuleSearchable{
@Resource
ZfEconomyService zfEconomyService;
@@ -55,10 +58,22 @@
@Resource
ZfEconomyMapper zfEconomyMapper;
+ @Resource
+ EsService esService;
+
+ @Resource
+ RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ ZfEconomyShaService zfEconomyShaService;
+
+ @Resource
+ ZfEconomyDownlService zfEconomyDownlService;
+
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());
@@ -66,10 +81,44 @@
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());
+ 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<>();
@@ -83,6 +132,11 @@
lqw.eq(zfEconomy.getFamilyId()!=null,ZfEconomy::getFamilyId,zfEconomy.getFamilyId());
lqw.eq(zfEconomy.getHappenTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenTime());
return lqw;
+ }
+ @Override
+ public List<ZfEconomy> change(){
+ ZfEconomy zfEconomy = new ZfEconomy();
+ return list(buildCondition(zfEconomy,null));
}
// private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy, String familyIds, String secondFamilyAuthority) {
@@ -217,17 +271,35 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+
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(ECONOMY_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+ //鍔犱笂鐖舵瘝瀹舵棌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);
+ }
LambdaQueryWrapper<ZfEconomy> lambdaQueryWrapper = buildCondition(zfEconomy, idList);
List<ZfEconomy> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyId, beanRecords);
+ return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
}
@Override
@@ -276,12 +348,35 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
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(ECONOMY_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+
+ //鍔犱笂鐖舵瘝瀹舵棌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<ZfEconomy> lqw = buildCondition(zfEconomy, idList);
@@ -292,21 +387,21 @@
List<ZfEconomy> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
- List<ZfEconomy> dtoResult = markOwnData(familyId, beanRecords);
+ List<ZfEconomy> dtoResult = markOwnData(familyId, fatherFaId, motherFaId,beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
}
- public List<ZfEconomy> markOwnData(Long familyId,List<ZfEconomy> beanRecords){
+ public List<ZfEconomy> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEconomy> beanRecords){
return beanRecords.stream().peek(
- bean -> {
- if (bean.getFamilyId() == 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());
}
@@ -369,6 +464,9 @@
@Override
public AjaxResult addData(ZfEconomy zfEconomy) {
+ //娓呴櫎redis涓瓃fEconomy鐨勭紦瀛�
+ clearAllCache();
+
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
@@ -399,14 +497,33 @@
}
if (save(zfEconomy)) {
+ EsModel esModel = new EsModel();
+ Integer inte = zfEconomy.getId().intValue();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtTableName("瀹跺涵鏀舵敮鍙拌处");
+ esModel.setBy1(zfEconomy.getUseFor());
+ esModel.setBy2(zfEconomy.getUsePeople());
+ esModel.setBy5("/family/zfEconomy");
+ esModel.setRemark(zfEconomy.getRemark());
+ esModel.setFid(familyId);
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esService.insertTable(esModel);
return AjaxResult.success();
} else {
return AjaxResult.error();
}
}
+ @Resource
+ ZfLogService zfLogService;
+
@Override
public AjaxResult updateData(ZfEconomy zfEconomy) {
+ //娓呴櫎redis涓瓃fEconomy鐨勭紦瀛�
+ clearAllCache();
+
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
@@ -421,7 +538,58 @@
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("瀹跺涵鏀舵敮鍙拌处");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+
if(updateById(zfEconomy)){
+
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfEconomy dataById = getById(zfEconomy.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵鏀舵敮鍙拌处");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+ if(zfEconomy.getUseFor()!=null){
+ newModel.setBy1(zfEconomy.getUseFor());
+ }else {
+ newModel.setBy1(dataById.getUseFor());
+ }
+
+ if(zfEconomy.getUsePeople()!=null){
+ newModel.setBy2(zfEconomy.getUsePeople());
+ }else {
+ newModel.setBy2(dataById.getUsePeople());
+ }
+
+ if(zfEconomy.getRemark()!=null){
+ newModel.setRemark(zfEconomy.getRemark());
+ }else {
+ newModel.setRemark(dataById.getRemark());
+ }
+
+
+ UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+ updateRequest.doc(
+ "by1",newModel.getBy1(),
+ "by2",newModel.getBy2(),
+ "remark",newModel.getRemark()
+ );
+
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return AjaxResult.success();
}else {
return AjaxResult.error();
@@ -444,8 +612,26 @@
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
}
-
+ List<ZfEconomy> zfEconomys = listByIds(Arrays.asList(ids));
+ if (! (zfEconomyDownlService.deleteData(ids) && zfEconomyShaService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
if (zfEconomyService.removeByIds(Arrays.asList(ids))) {
+
+ //鍒犻櫎es涓殑鏁版嵁
+ zfEconomys.stream().forEach(zfEconomy -> {
+ EsModel esModel = esService.findByCtId(zfEconomy.getId().intValue(), "瀹跺涵鏀舵敮鍙拌处");
+
+ if (esModel != null){
+ DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+ try {
+ restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ }
+ });
return AjaxResult.success();
}else {
return AjaxResult.error();
@@ -459,4 +645,57 @@
}
+ @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) {
+ ZfEconomy zfEconomy = new ZfEconomy();
+ zfEconomy.setCompanion(companion);
+ zfEconomy.setHappenStartTime(happenStartTime);
+ zfEconomy.setHappenEndTime(happenEndTime);
+
+ String[] split = companion.split(",");
+ List<String> list = Arrays.asList(split);
+
+ System.out.println("[[[[[[[["+hasAttachment);
+ zfEconomy.setCompanionList(list);
+ zfEconomy.setHasAttachment(hasAttachment);
+ 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