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/ZfCleanServiceImpl.java | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 274 insertions(+), 19 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index 1ed99a3..080b075 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -2,33 +2,34 @@
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.ZfClean;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfCleanMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfCleanService;
+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.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.stream.Collectors;
import static com.ruoyi.constant.MenuAuthority.*;
@@ -43,7 +44,7 @@
*/
@Service
@Slf4j
-public class ZfCleanServiceImpl extends ServiceImpl<ZfCleanMapper, ZfClean> implements ZfCleanService {
+public class ZfCleanServiceImpl extends ServiceImpl<ZfCleanMapper, ZfClean> implements ZfCleanService,ModuleSearchable {
@Resource
ZInfoUserService zInfoUserService;
@@ -54,10 +55,26 @@
@Resource
ZAuthorityService zAuthorityService;
+ @Resource
+ ZfLogService zfLogService;
+
+ @Resource
+ EsService esService;
+
+ @Resource
+ RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ ZfCleanShareService zfCleanShareService;
+
+ @Resource
+ ZfCleanDownloadService zfCleanDownloadService;
+
private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean,List<Long> familyIdList) {
LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfClean::getCreateTime);
lqw.eq(zfClean.getKind() != null, ZfClean::getKind, zfClean.getKind())
+ .eq(zfClean.getId()!=null,ZfClean::getId,zfClean.getId())
.like(StringUtils.isNotEmpty(zfClean.getSuitable()), ZfClean::getSuitable, zfClean.getSuitable())
.like(StringUtils.isNotEmpty(zfClean.getType()), ZfClean::getType, zfClean.getType())
.like(StringUtils.isNotEmpty(zfClean.getMethod()), ZfClean::getMethod, zfClean.getMethod())
@@ -65,8 +82,49 @@
.like(StringUtils.isNotEmpty(zfClean.getLocation()), ZfClean::getLocation, zfClean.getLocation())
.like(StringUtils.isNotEmpty(zfClean.getRemark()), ZfClean::getRemark, zfClean.getRemark())
.eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime())
- .in(ZfClean::getFamilyId,familyIdList)
+ .in(familyIdList != null,ZfClean::getFamilyId,familyIdList)
.between(zfClean.getHappenStartTime() != null && zfClean.getHappenEndTime() != null, ZfClean::getHappenTime, zfClean.getHappenStartTime(), zfClean.getHappenEndTime());
+ if (StringUtils.isNotEmpty(zfClean.getIsHide())) {
+
+ lqw.and(wrapper -> wrapper
+ .ne(ZfClean::getIsHide, "鏄�")
+ .or()
+ .isNull(ZfClean::getIsHide)
+ );
+ }
+ if (zfClean.getHasAttachment() != null && zfClean.getHasAttachment().equals("鏄�")) {
+ lqw.apply("url IS NOT NULL AND url != ''");
+ }
+// lqw.in(StringUtils.isNotEmpty(zfClean.getCompanionList()),zfClean::getCompanion,zfClean.getCompanionList());
+// if (zfClean.getYear() != 0) {
+// System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfClean.getYear());
+// lqw.apply("YEAR(happen_time) = {0}", zfClean.getYear());
+// }
+
+ if (CollectionUtils.isNotEmpty(zfClean.getCompanionList())) {
+ List<String> companionList = zfClean.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(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime());
+
return lqw;
}
@@ -217,16 +275,34 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
+
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ System.out.println("11111111111111111111");
+ 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(CLEAN_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+ //鍔犱笂鐖舵瘝鐨刬d
+ 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<ZfClean> lambdaQueryWrapper = buildCondition(zfClean, idList);
List<ZfClean> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyId, beanRecords);
+ return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
}
@Override
@@ -257,16 +333,16 @@
// }).collect(Collectors.toList());
// }
- public List<ZfClean> markOwnData(Long familyId,List<ZfClean> beanRecords){
+ public List<ZfClean> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfClean> 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);
}
}
- ).collect(Collectors.toList());
+ ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
}
@Override
@@ -287,12 +363,35 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
+ System.out.println("22222222222222222222");
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ 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(CLEAN_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<ZfClean> lqw = buildCondition(zfClean, idList);
@@ -303,7 +402,7 @@
List<ZfClean> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
- List<ZfClean> dtoResult = markOwnData(familyId, beanRecords);
+ List<ZfClean> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
@@ -312,6 +411,9 @@
@Override
public AjaxResult addData(ZfClean zfClean) {
+
+ if(zfClean.getKind()==null)
+ zfClean.setKind(0);
// String familyIds = listFamilyIds();
// boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞�
// if (familyIds.contains(",")) {
@@ -367,6 +469,23 @@
}
if (save(zfClean)) {
+ EsModel esModel = new EsModel();
+ Integer inte = zfClean.getId().intValue();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtTableName("淇濇磥涓庢敹绾�");
+ esModel.setBy1(zfClean.getType());
+ esModel.setBy2(zfClean.getMethod());
+ esModel.setBy3(zfClean.getPlace());
+ esModel.setBy4(zfClean.getSuitable());
+ esModel.setBy5("/family/zfClean");
+ esModel.setRemark(zfClean.getRemark());
+ esModel.setFid(familyId);
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esService.insertTable(esModel);
+
+
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -424,9 +543,10 @@
throw new RuntimeException(e);
}
log.info("鏁版嵁鍒楄〃涓猴細{}", dataList);
-
for (ZfClean zfClean : dataList) {
- zfCleanService.addData(zfClean);
+ if (zfClean.getMethod().length() != 0 && zfClean.getPlace().length() != 0 && zfClean.getSuitable().length() != 0) {
+ zfCleanService.addData(zfClean);
+ }
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
@@ -449,7 +569,73 @@
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("淇濇磥鏀剁撼");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+
+
if(updateById(zfClean)){
+
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfClean dataById = getById(zfClean.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "淇濇磥涓庢敹绾�");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+ if(zfClean.getType()!=null){
+ newModel.setBy1(zfClean.getType());
+ }else {
+ newModel.setBy1(dataById.getType());
+ }
+
+ if(zfClean.getMethod()!=null){
+ newModel.setBy2(zfClean.getMethod());
+ }else {
+ newModel.setBy2(dataById.getMethod());
+ }
+
+ if(zfClean.getPlace()!=null){
+ newModel.setBy3(zfClean.getPlace());
+ }else {
+ newModel.setBy3(dataById.getPlace());
+ }
+
+ if(zfClean.getSuitable()!=null){
+ newModel.setBy4(zfClean.getSuitable());
+ }else {
+ newModel.setBy4(dataById.getSuitable());
+ }
+
+ if(zfClean.getRemark()!=null){
+ newModel.setRemark(zfClean.getRemark());
+ }else {
+ newModel.setRemark(dataById.getRemark());
+ }
+
+
+ UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+ updateRequest.doc(
+ "by1",newModel.getBy1(),
+ "by2",newModel.getBy2(),
+ "by3",newModel.getBy3(),
+ "by4",newModel.getBy4(),
+ "remark",newModel.getRemark()
+ );
+
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return AjaxResult.success();
}else {
return AjaxResult.error();
@@ -475,7 +661,25 @@
}
}
+ List<ZfClean> zfCleans = listByIds(Arrays.asList(ids));
+ if (! (zfCleanDownloadService.deleteData(ids) && zfCleanShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
if (zfCleanService.removeByIds(Arrays.asList(ids))) {
+
+ //鍒犻櫎es涓殑鏁版嵁
+ zfCleans.stream().forEach(zfClean -> {
+ EsModel esModel = esService.findByCtId(zfClean.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();
@@ -485,4 +689,55 @@
}
+ @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) {
+ ZfClean zfClean = new ZfClean();
+ zfClean.setCompanion(companion);
+ zfClean.setHappenStartTime(happenStartTime);
+ zfClean.setHappenEndTime(happenEndTime);
+
+ String[] split = companion.split(",");
+ List<String> list = Arrays.asList(split);
+
+ zfClean.setCompanionList(list);
+ zfClean.setHasAttachment(hasAttachment);
+ zfClean.setIsHide("鍚�");
+
+ System.out.println("[[[[[[[["+zfClean);
+
+ return dataList(zfClean);
+ }
+
+ public List<zfEventdto> dataList(ZfClean zfClean) {
+
+ LambdaQueryWrapper<ZfClean> lqw = buildCondition(zfClean, null);
+
+ List<ZfClean> beanRecords = list(lqw);
+
+
+
+ return encapData(beanRecords);
+ }
+
+ public List<zfEventdto> encapData(List<ZfClean> lis)
+ {
+ List<zfEventdto> daoRes = new ArrayList<>() ;
+ for(ZfClean 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