From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java | 129 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 119 insertions(+), 10 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
index 0101b78..49a5e1c 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
@@ -1,13 +1,17 @@
package com.gkhy.safePlatform.equipment.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.equipment.entity.*;
import com.gkhy.safePlatform.equipment.model.dto.req.*;
+import com.gkhy.safePlatform.equipment.repository.EquipmentTypeMngRepository;
import com.gkhy.safePlatform.equipment.repository.KeypointEquipmentInfoRepository;
import com.gkhy.safePlatform.equipment.service.*;
+import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -20,8 +24,7 @@
import org.springframework.util.StringUtils;
import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -52,6 +55,15 @@
@Autowired
private EquipmentCheckStandardDetailService equipmentCheckStandardDetailService;
+ @DubboReference(check = false)
+ private AccountDepartmentService accountDepartmentService;
+
+ @Autowired
+ private EquipmentInfoService equipmentInfoService;
+
+ @Autowired
+ private EquipmentTypeMngRepository equipmentTypeMngRepository;
+
@Override
public ResultVO queryAll(PageQuery<KeypointEquipmentInfoQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -62,8 +74,7 @@
QueryHelpPlus.getPredicate(KeypointEquipmentInfo.class, pageQuery.getSearchParams()));
List<KeypointEquipmentInfoDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), KeypointEquipmentInfoDto.class);
- // TODO:获取所属部门名称
-
+ Set<Long> collectTypeIdSet = new HashSet();
//获取额外信息
respList.forEach(f->{
//设备保养
@@ -89,7 +100,41 @@
criteria2.setInfoTpe(3);
List<EquipmentRepairDetail> repairDetailList = equipmentRepairDetailService.queryAll(criteria2);
f.setRepaireDetailList(repairDetailList);
+
+ // --------------------------- 获取设备设施类型管理ID-----------------------
+ collectTypeIdSet.add(f.getEquipmentTypeId());
+
+ // --------------------------- 获取部门信息-----------------------
+ //收集所用到的部门ID
+ Set<Long> collectDepIdSet = new HashSet();
+ collectDepIdSet.add(f.getDepartmentId());
+ takecareDetailList.forEach(info->{collectDepIdSet.add(info.getLeadingPersonDepartmentId());});
+ checkDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
+ repairDetailList.forEach(info->{collectDepIdSet.add(info.getRepairPersonDepartmentId());});
+
+ //获取部门名集合
+ Map<Long,String> depNameMap = equipmentInfoService.getDepName(collectDepIdSet);
+
+ //set
+ f.setDepartmentName(depNameMap.get(f.getDepartmentId()));
+ takecareDetailList.forEach(info->{info.setLeadingPersonDepartmentName(depNameMap.get(info.getLeadingPersonDepartmentId()));});
+ checkDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
+ repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
});
+
+
+ //获取设备设施类型名称
+ if(!collectTypeIdSet.isEmpty()){
+ List<EquipmentTypeMng> typeMngList = equipmentTypeMngRepository.selectList(new QueryWrapper<EquipmentTypeMng>().in("id",collectTypeIdSet));
+ Map<Long, String> typePool = new HashMap<>();
+ typeMngList.forEach(f->{
+ typePool.put(f.getId(),f.getTypeName());
+ });
+ respList.forEach(f->{
+ f.setEquipmentTypeName(typePool.get(f.getEquipmentTypeId()));
+ });
+ }
+
return new SearchResultVO<>(
true,
pageIndex,
@@ -153,6 +198,30 @@
List<EquipmentTakecareStardardDetail> takecareStardardDetailList = equipmentTakecareStardardDetailService.queryAll(criteria4);
infoDto.setTakecareStardardeDetailList(takecareStardardDetailList);
+ // --------------------------- 获取部门信息-----------------------
+ //收集所用到的部门ID
+ Set<Long> collectDepIdSet = new HashSet();
+ collectDepIdSet.add(infoDto.getDepartmentId());
+ takecareDetailList.forEach(info->{collectDepIdSet.add(info.getLeadingPersonDepartmentId());});
+ checkDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
+ repairDetailList.forEach(info->{collectDepIdSet.add(info.getRepairPersonDepartmentId());});
+
+ //获取部门名集合
+ Map<Long,String> depNameMap = equipmentInfoService.getDepName(collectDepIdSet);
+
+ //set
+ infoDto.setDepartmentName(depNameMap.get(infoDto.getDepartmentId()));
+ takecareDetailList.forEach(info->{info.setLeadingPersonDepartmentName(depNameMap.get(info.getLeadingPersonDepartmentId()));});
+ checkDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
+ repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
+
+ EquipmentTypeMng typeMng = equipmentTypeMngRepository.selectOne(new QueryWrapper<EquipmentTypeMng>().eq("id",infoDto.getEquipmentTypeId()));
+ if(typeMng != null){
+ infoDto.setEquipmentTypeName(typeMng.getTypeName());
+ }
+
+ // TODO 调用应急预案RPC
+ infoDto.setEmergencePlanName("");
return infoDto;
}
@@ -177,7 +246,15 @@
if(StringUtils.hasText(infoDto.getDelTakecareDetails())){
List<Long> idList = Arrays.stream(infoDto.getDelTakecareDetails().split(",")).map(s-> Long.parseLong(s.trim()))
.collect(Collectors.toList());
- equipmentTakecareDetailService.removeByIds(idList);
+
+ List<EquipmentTakecareDetail> delList = new ArrayList<>();
+ idList.forEach(f->{
+ EquipmentTakecareDetail info = new EquipmentTakecareDetail();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ equipmentTakecareDetailService.updateBatchById(delList);
}
//保存设备检测
@@ -190,7 +267,15 @@
if(StringUtils.hasText(infoDto.getDelTestDetails())){
List<Long> idList = Arrays.stream(infoDto.getDelTestDetails().split(",")).map(s-> Long.parseLong(s.trim()))
.collect(Collectors.toList());
- equipmentTestDetailService.removeByIds(idList);
+ List<EquipmentTestDetail> delList = new ArrayList<>();
+ idList.forEach(f->{
+ EquipmentTestDetail info = new EquipmentTestDetail();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ equipmentTestDetailService.updateBatchById(delList);
+
}
//设备检查 TODO
@@ -205,7 +290,15 @@
if(StringUtils.hasText(infoDto.getDelRepaireDetails())){
List<Long> idList = Arrays.stream(infoDto.getDelRepaireDetails().split(",")).map(s-> Long.parseLong(s.trim()))
.collect(Collectors.toList());
- equipmentRepairDetailService.removeByIds(idList);
+ List<EquipmentRepairDetail> delList = new ArrayList<>();
+ idList.forEach(f->{
+ EquipmentRepairDetail info = new EquipmentRepairDetail();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ equipmentRepairDetailService.updateBatchById(delList);
+
}
//保存检查标准
List<EquipmentCheckStandardDetail> checkStandardeDetailList = infoDto.getCheckStandardeDetailList();
@@ -217,7 +310,15 @@
if(StringUtils.hasText(infoDto.getDelCheckStandardeDetails())){
List<Long> idList = Arrays.stream(infoDto.getDelCheckStandardeDetails().split(",")).map(s-> Long.parseLong(s.trim()))
.collect(Collectors.toList());
- equipmentCheckStandardDetailService.removeByIds(idList);
+ List<EquipmentCheckStandardDetail> delList = new ArrayList<>();
+ idList.forEach(f->{
+ EquipmentCheckStandardDetail info = new EquipmentCheckStandardDetail();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ equipmentCheckStandardDetailService.updateBatchById(delList);
+
}
//保存保养标准
List<EquipmentTakecareStardardDetail> takecareStardardeDetailList = infoDto.getTakecareStardardeDetailList();
@@ -229,7 +330,15 @@
if(StringUtils.hasText(infoDto.getDelTakecareStardardeDetails())){
List<Long> idList = Arrays.stream(infoDto.getDelTakecareStardardeDetails().split(",")).map(s-> Long.parseLong(s.trim()))
.collect(Collectors.toList());
- equipmentTakecareStardardDetailService.removeByIds(idList);
+ List<EquipmentTakecareStardardDetail> delList = new ArrayList<>();
+ idList.forEach(f->{
+ EquipmentTakecareStardardDetail info = new EquipmentTakecareStardardDetail();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ equipmentTakecareStardardDetailService.updateBatchById(delList);
+
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2