From 81995abfa712d65b7f7f1e23b97a97bc4065103d Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 25 十月 2024 23:11:30 +0800
Subject: [PATCH] 修改了bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 68 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 13 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..0a246d1 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;
@@ -58,6 +55,12 @@
@Resource
private RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ private ZfEquipShareService zfEquipShareService;
+
+ @Resource
+ private ZfEquipDownloadService zfEquipDownloadService;
private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
@@ -220,16 +223,26 @@
//瑕佹煡鑷繁瀹跺涵鐨�
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.getInfoBysysId(myself.getMomId()).getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+
LambdaQueryWrapper<ZfEquipment> lambdaQueryWrapper = buildCondition(zfEquipment, idList);
List<ZfEquipment> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyId, beanRecords);
+ return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);
}
@Override
@@ -259,10 +272,10 @@
// }).collect(Collectors.toList());
// }
- public List<ZfEquipment> markOwnData(Long familyId,List<ZfEquipment> beanRecords){
+ public List<ZfEquipment> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfEquipment> beanRecords){
return beanRecords.stream().peek(
bean -> {
- if (bean.getFamilyId() == familyId) {
+ if (bean.getFamilyId() == familyId ||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
bean.setOwnData(1);
} else {
bean.setOwnData(0);
@@ -289,12 +302,28 @@
//瑕佹煡鑷繁瀹跺涵鐨�
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(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds();
LambdaQueryWrapper<ZfEquipment> lqw = buildCondition(zfEquipment, idList);
@@ -305,7 +334,7 @@
List<ZfEquipment> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
- List<ZfEquipment> dtoResult = markOwnData(familyId, beanRecords);
+ List<ZfEquipment> dtoResult = markOwnData(familyId, fatherFaId, motherFaId,beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
@@ -445,7 +474,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 +517,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵璁惧");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
@@ -559,19 +595,25 @@
}
List<ZfEquipment> zfEquipments = listByIds(Arrays.asList(ids));
+ if (! (zfEquipDownloadService.deleteData(ids) && zfEquipShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
if (zfEquipmentService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎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();
}else {
return AjaxResult.error();
--
Gitblit v1.9.1