From 421ad17ed07f8a4201e9ad4d2a1072f0fbe10524 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 06 七月 2022 16:39:21 +0800
Subject: [PATCH] 应急队伍
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 8 ++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java | 2 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 25 +++++++++++++++++++------
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
index 441a3fb..1f2fd8a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
@@ -75,6 +75,14 @@
}
/**
+ * 应急队伍修改（应急人员详情）
+ */
+ @RequestMapping(value = "/infoMember/{id}",method = RequestMethod.GET)
+ public ResultVO getEmergencyTeamMemberById(@PathVariable("id")Long id){
+ return emergencyTeamService.getEmergencyTeamMemberById(id);
+ }
+
+ /**
* 应急队伍修改（应急人员修改）
*/
@RequestMapping(value = "/updateMember",method = RequestMethod.POST)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
index 8ef2d70..36cfba6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
@@ -28,4 +28,6 @@
ResultVO deleteEmergencyTeam(Long id);
ResultVO deleteEmergencyTeamMember(Long id);
+
+ ResultVO getEmergencyTeamMemberById(Long id);
}
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..2438b2b 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
@@ -150,14 +150,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 +168,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 +237,8 @@
emergencyTeamMemberInfo.setUpdateUid(uid);
emergencyTeamMemberInfo.setGmtModitify(new Date());
emergencyTeamMemberInfoService.updateEmergencyTeamMember(emergencyTeamMemberInfo);
+ return new ResultVO(ResultCodes.OK);
}
- return new ResultVO(ResultCodes.OK);
}
@Override
@@ -255,8 +255,8 @@
emergencyTeamFileInfoService.deleteEmergencyTeamFileByTeamId(teamId);
//删除应急队伍
emergencyTeamInfoService.deleteEmergencyTeamById(teamId);
+ return new ResultVO(ResultCodes.OK);
}
- return new ResultVO(ResultCodes.OK);
}
@Override
@@ -267,8 +267,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