From 3ce299ce3e9db1342b519dd8d8b9062c7f99eeea Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 30 八月 2024 20:03:17 +0800
Subject: [PATCH] 修改了登录的代码1
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 e925a07..9f007e5 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
@@ -6,16 +6,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
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.*;
-import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.update.UpdateRequest;
@@ -289,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();
@@ -445,7 +447,10 @@
log.info("璧勪骇鍒楄〃涓猴細{}", propertyList);
for (ZfEquipment zfEquipment : propertyList) {
- zfEquipmentService.addData(zfEquipment);
+ if (zfEquipment.getName().length() != 0 && zfEquipment.getContent().length() != 0 && zfEquipment.getBuyer() .length() != 0){
+ zfEquipmentService.addData(zfEquipment);
+ }
+
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
@@ -485,6 +490,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵璁惧");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
@@ -565,11 +574,13 @@
//鍒犻櫎es涓殑鏁版嵁
zfEquipments.stream().forEach(zfEquipment -> {
EsModel esModel = esService.findByCtId(zfEquipment.getId().intValue(), "瀹跺涵璁惧");
- DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
- try {
- restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
+ 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();
--
Gitblit v1.9.1