From 944a01d60ffd53ca3a3b87ccfcaedc096219aba2 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 17 九月 2023 23:42:47 +0800
Subject: [PATCH] 77777
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 104 insertions(+), 4 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 415f1c4..95c6744 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
@@ -7,6 +7,7 @@
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.EsModel;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -16,17 +17,19 @@
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.service.ZfLogService;
+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.io.IOException;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -59,6 +62,12 @@
@Resource
ZfLogService zfLogService;
+
+ @Resource
+ EsService esService;
+
+ @Resource
+ RestHighLevelClient restHighLevelClient;
private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) {
LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
@@ -383,6 +392,23 @@
}
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());
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esService.insertTable(esModel);
+
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -437,6 +463,67 @@
if(updateById(zfCollection)){
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfCollection dataById = getById(zfCollection.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "鏀惰棌鍜岃崳瑾�");
+
+ //鎿嶄綔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 {
return AjaxResult.error();
@@ -460,7 +547,20 @@
}
}
+ List<ZfCollection> zfCollections = listByIds(Arrays.asList(ids));
+
if (zfCollectionService.removeByIds(Arrays.asList(ids))) {
+
+ //鍒犻櫎es涓殑鏁版嵁
+ zfCollections.stream().forEach(zfCollection -> {
+ EsModel esModel = esService.findByCtId(zfCollection.getId().intValue(), "鏀惰棌鍜岃崳瑾�");
+ 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