From 35924055a41e1505aceacef503fd3cfa7a064a36 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 26 八月 2025 20:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 223 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 193 insertions(+), 30 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index f5e0788..a53bada 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -1,31 +1,30 @@
package com.ruoyi.service.impl;
-import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.JsonParser;
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.ZfCollection;
-import com.ruoyi.domain.ZfCollection;
import com.ruoyi.mapper.ZfCollectionMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfCollectionService;
-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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -54,6 +53,21 @@
@Resource
ZfCollectionMapper zfCollectionMapper;
+
+ @Resource
+ ZfLogService zfLogService;
+
+ @Resource
+ EsService esService;
+
+ @Resource
+ RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ ZfCollectionShareService zfCollectionShareService;
+
+ @Resource
+ ZfCollectionDownloadService zfCollectionDownloadService;
private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) {
LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
@@ -218,16 +232,33 @@
//瑕佹煡鑷繁瀹跺涵鐨�
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(COLLECTION_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<ZfCollection> lambdaQueryWrapper = buildCondition(zfCollection, idList);
List<ZfCollection> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyId, beanRecords);
+ return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
}
@Override
@@ -258,10 +289,10 @@
// }).collect(Collectors.toList());
// }
- public List<ZfCollection> markOwnData(Long familyId,List<ZfCollection> beanRecords){
+ public List<ZfCollection> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfCollection> 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);
@@ -288,12 +319,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(COLLECTION_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<ZfCollection> lqw = buildCondition(zfCollection, idList);
@@ -304,7 +358,7 @@
List<ZfCollection> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
- List<ZfCollection> dtoResult = markOwnData(familyId, beanRecords);
+ List<ZfCollection> dtoResult = markOwnData(familyId, fatherFaId, motherFaId,beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
@@ -378,6 +432,24 @@
}
if (save(zfCollection)) {
+
+ EsModel esModel = new EsModel();
+ Integer inte = zfCollection.getId().intValue();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtTableName("鏀惰棌鍜岃崳瑾�");
+ esModel.setBy1(zfCollection.getType());
+ esModel.setBy2(zfCollection.getName());
+ esModel.setBy3(zfCollection.getSource());
+ esModel.setBy4(zfCollection.getOwner());
+ esModel.setBy5("/family/zfCollection");
+ esModel.setBy6(zfCollection.getLocation());
+ esModel.setRemark(zfCollection.getRemark());
+ esModel.setFid(familyId);
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esService.insertTable(esModel);
+
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -403,27 +475,99 @@
//鍏堣褰曚笅璋佹洿鏂般�佷綍鏃舵洿鏂般�佹洿鏂颁簡鍝噷
- LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZfCollection::getId,zfCollection.getId());
- zfCollectionService.getOne(lqw);
- ZfCollection oldData = getOne(lqw);
+// LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
+// lqw.eq(ZfCollection::getId,zfCollection.getId());
+// zfCollectionService.getOne(lqw);
+// ZfCollection oldData = getOne(lqw);
+//
+// String oldJson = JSONObject.toJSONString(oldData);
+// String newJson = JSONObject.toJSONString(zfCollection);
+//
+// Map oldMap = JSONObject.parseObject(oldJson, Map.class);
+// Map newMap = JSONObject.parseObject(newJson, Map.class);
+//
+// for (Object key : oldMap.keySet()) {
+// if(newMap.get(key)!=null && !newMap.get(key).equals(oldMap.get(key))){
+// System.out.println(newMap.get(key)+" "+oldMap.get(key));
+// Date date = new Date();
+// System.out.println("鐢ㄦ埛"+myself.getNickName()+"鍦�"+date+"杩欎釜鏃堕棿"+"淇敼浜�<鏀惰棌鑽ｈ獕>妯″潡鐨�"+key+"瀛楁");
+// }
+// }
- String oldJson = JSONObject.toJSONString(oldData);
- String newJson = JSONObject.toJSONString(zfCollection);
-
- Map oldMap = JSONObject.parseObject(oldJson, Map.class);
- Map newMap = JSONObject.parseObject(newJson, Map.class);
-
- for (Object key : oldMap.keySet()) {
- if(newMap.get(key)!=null && !newMap.get(key).equals(oldMap.get(key))){
- System.out.println(newMap.get(key)+" "+oldMap.get(key));
- Date date = new Date();
- System.out.println("鐢ㄦ埛"+myself.getNickName()+"鍦�"+date+"杩欎釜鏃堕棿"+"淇敼浜�<鏀惰棌鑽ｈ獕>妯″潡鐨�"+key+"瀛楁");
- }
- }
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("鏀惰棌鑽ｈ獕");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
if(updateById(zfCollection)){
+
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfCollection dataById = getById(zfCollection.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "鏀惰棌鍜岃崳瑾�");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+ if(zfCollection.getType()!=null){
+ newModel.setBy1(zfCollection.getType());
+ }else {
+ newModel.setBy1(dataById.getType());
+ }
+
+ if(zfCollection.getName()!=null){
+ newModel.setBy2(zfCollection.getName());
+ }else {
+ newModel.setBy2(dataById.getName());
+ }
+
+ if(zfCollection.getSource()!=null){
+ newModel.setBy3(zfCollection.getSource());
+ }else {
+ newModel.setBy3(dataById.getSource());
+ }
+
+ if(zfCollection.getOwner()!=null){
+ newModel.setBy4(zfCollection.getOwner());
+ }else {
+ newModel.setBy4(dataById.getOwner());
+ }
+
+ if(zfCollection.getLocation()!=null){
+ newModel.setBy6(zfCollection.getLocation());
+ }else {
+ newModel.setBy6(dataById.getLocation());
+ }
+
+ if(zfCollection.getRemark()!=null){
+ newModel.setRemark(zfCollection.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(),
+ "by6",newModel.getBy6(),
+ "remark",newModel.getRemark()
+ );
+
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return AjaxResult.success();
}else {
@@ -448,7 +592,26 @@
}
}
+ List<ZfCollection> zfCollections = listByIds(Arrays.asList(ids));
+ if (! ( zfCollectionDownloadService.deleteData(ids) && zfCollectionShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
if (zfCollectionService.removeByIds(Arrays.asList(ids))) {
+
+ //鍒犻櫎es涓殑鏁版嵁
+ zfCollections.stream().forEach(zfCollection -> {
+ EsModel esModel = esService.findByCtId(zfCollection.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();
--
Gitblit v1.9.1