From 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 16 六月 2024 13:45:39 +0800
Subject: [PATCH] 修改了权限的代码
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 131 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 119 insertions(+), 12 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index 50ceebe..79a6af0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -5,28 +5,27 @@
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.ZfEquipment;
import com.ruoyi.mapper.ZfEquipmentMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfEquipmentService;
-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.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.*;
@@ -50,6 +49,12 @@
@Resource
ZAuthorityService zAuthorityService;
+
+ @Resource
+ EsService esService;
+
+ @Resource
+ private RestHighLevelClient restHighLevelClient;
private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
@@ -281,6 +286,11 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -335,6 +345,23 @@
}
if (save(zfEquipment)) {
+
+ EsModel esModel = new EsModel();
+ Integer inte = zfEquipment.getId().intValue();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtTableName("瀹跺涵璁惧");
+ esModel.setBy1(zfEquipment.getName());
+ esModel.setBy2(zfEquipment.getBuyer());
+ esModel.setBy3(zfEquipment.getContent());
+ esModel.setBy4(zfEquipment.getLocation());
+ esModel.setBy5("/family/zfEquipment");
+ esModel.setRemark(zfEquipment.getRemark());
+ esModel.setFid(familyId);
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esService.insertTable(esModel);
+
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -407,8 +434,6 @@
// }
-
-
@Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
@@ -429,6 +454,9 @@
}
+ @Resource
+ ZfLogService zfLogService;
+
@Override
public AjaxResult updateData(ZfEquipment zfEquipment) {
@@ -446,7 +474,71 @@
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("瀹跺涵璁惧");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+
if(updateById(zfEquipment)){
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfEquipment dataById = getById(zfEquipment.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵璁惧");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+ if(zfEquipment.getName()!=null){
+ newModel.setBy1(zfEquipment.getName());
+ }else {
+ newModel.setBy1(dataById.getName());
+ }
+
+ if(zfEquipment.getBuyer()!=null){
+ newModel.setBy2(zfEquipment.getBuyer());
+ }else {
+ newModel.setBy2(dataById.getBuyer());
+ }
+
+ if(zfEquipment.getContent()!=null){
+ newModel.setBy3(zfEquipment.getContent());
+ }else {
+ newModel.setBy3(dataById.getContent());
+ }
+
+ if(zfEquipment.getLocation()!=null){
+ newModel.setBy4(zfEquipment.getLocation());
+ }else {
+ newModel.setBy4(dataById.getLocation());
+ }
+
+ if(zfEquipment.getRemark()!=null){
+ newModel.setRemark(zfEquipment.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();
@@ -472,7 +564,22 @@
}
}
+ List<ZfEquipment> zfEquipments = listByIds(Arrays.asList(ids));
+
if (zfEquipmentService.removeByIds(Arrays.asList(ids))) {
+
+ //鍒犻櫎es涓殑鏁版嵁
+ zfEquipments.stream().forEach(zfEquipment -> {
+ EsModel esModel = esService.findByCtId(zfEquipment.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