From 0ce7df5c83217a0561ef71e927444ae8f52c2a47 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 07 七月 2022 17:45:07 +0800
Subject: [PATCH] 应急预案新增+详情
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
index b40fdf9..f9b1395 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -95,10 +95,13 @@
emergencyTeamInfo.setGmtCreate(nowDate);
emergencyTeamInfoService.addEmergencyTeam(emergencyTeamInfo);
//2.新增应急队伍附件
- addEmergencyTeamFile(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getFileList());
+ if (!CollectionUtils.isEmpty(emergencyTeamReqDTO.getFileList())){
+ addEmergencyTeamFile(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getFileList());
+ }
//3.新增应急队伍人员
- addEmergencyTeamMember(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getMemberList());
-
+ if (!CollectionUtils.isEmpty(emergencyTeamReqDTO.getMemberList())){
+ addEmergencyTeamMember(emergencyTeamInfo.getId(),uid,nowDate,emergencyTeamReqDTO.getMemberList());
+ }
return new ResultVO(ResultCodes.OK);
}
@@ -150,14 +153,14 @@
List<EmergencyTeamMemberRespDTO> emergencyTeamMemberRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamMemberInfoDOList , EmergencyTeamMemberRespDTO.class);
emergencyTeamDetailRespDTO.setMemberList(emergencyTeamMemberRespDTOList);
}
+ return new ResultVO<>(ResultCodes.OK ,emergencyTeamDetailRespDTO);
}
- return new ResultVO<>(ResultCodes.OK ,emergencyTeamDetailRespDTO);
}
@Override
public ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
//查询是否存在
- EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(uid);
+ EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(emergencyTeamReqDTO.getId());
if (emergencyTeamInfoDetailDO==null){
throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST);
}else{
@@ -168,8 +171,8 @@
emergencyTeamInfoService.updateEmergencyTeam(emergencyTeamInfo);
//修改应急队伍附件
updateEmergencyTeamFile(uid,emergencyTeamReqDTO.getId(),emergencyTeamReqDTO.getFileList());
+ return new ResultVO(ResultCodes.OK);
}
- return new ResultVO(ResultCodes.OK);
}
private void updateEmergencyTeamFile(Long uid ,Long teamId ,List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){
@@ -237,8 +240,8 @@
emergencyTeamMemberInfo.setUpdateUid(uid);
emergencyTeamMemberInfo.setGmtModitify(new Date());
emergencyTeamMemberInfoService.updateEmergencyTeamMember(emergencyTeamMemberInfo);
+ return new ResultVO(ResultCodes.OK);
}
- return new ResultVO(ResultCodes.OK);
}
@Override
@@ -255,8 +258,21 @@
emergencyTeamFileInfoService.deleteEmergencyTeamFileByTeamId(teamId);
//删除应急队伍
emergencyTeamInfoService.deleteEmergencyTeamById(teamId);
+ return new ResultVO(ResultCodes.OK);
}
- return new ResultVO(ResultCodes.OK);
+ }
+
+ @Override
+ public ResultVO batchDeleteEmergencyTeam(String ids) {
+ if (StringUtils.isBlank(ids)){
+ throw new EmergencyException(EmergencyResultCodes.TEAM_NULL);
+ }else{
+ String[] idArr = ids.split(",");
+ for (String id : idArr) {
+ deleteEmergencyTeam(Long.valueOf(id));
+ }
+ return new ResultVO(ResultCodes.OK);
+ }
}
@Override
@@ -267,8 +283,21 @@
throw new EmergencyException(EmergencyResultCodes.TEAM_USER_NOT_EXIST);
}else{
emergencyTeamMemberInfoService.deleteEmergencyTeamMemberById(id);
+ return new ResultVO(ResultCodes.OK);
}
- return new ResultVO(ResultCodes.OK);
+ }
+
+ @Override
+ public ResultVO<EmergencyTeamMemberRespDTO> getEmergencyTeamMemberById(Long id) {
+ //查询是否存在
+ EmergencyTeamMemberInfoDO emergencyTeamMemberInfoDO = emergencyTeamMemberInfoService.selectEmergencyTeamMemberById(id);
+ if (emergencyTeamMemberInfoDO==null){
+ throw new EmergencyException(EmergencyResultCodes.TEAM_USER_NOT_EXIST);
+ }else{
+ EmergencyTeamMemberRespDTO emergencyTeamMemberRespDTO = new EmergencyTeamMemberRespDTO();
+ BeanUtils.copyProperties(emergencyTeamMemberInfoDO,emergencyTeamMemberRespDTO);
+ return new ResultVO<>(ResultCodes.OK ,emergencyTeamMemberRespDTO);
+ }
}
--
Gitblit v1.9.2