From d6827ed9a8e7ac1d8d3a932d2f93a8476df81806 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期三, 13 七月 2022 15:32:56 +0800 Subject: [PATCH] 应急演练实施评价 fix --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 62 ++++++++++++++++++++++++++++--- 1 files changed, 56 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 2cac0c3..763020f 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 @@ -3,15 +3,14 @@ import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.utils.PageUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; +import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamMemberReqDTO; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO; +import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery; import com.gkhy.safePlatform.emergency.service.EmergencyTeamService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.security.Principal; import java.util.List; @@ -44,8 +43,59 @@ /** * 应急队伍详情 */ - @RequestMapping(value = "/detail",method = RequestMethod.GET) - public ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id){ + @RequestMapping(value = "/info/{id}",method = RequestMethod.GET) + public ResultVO<EmergencyTeamDetailRespDTO> getEmergencyTeamById(@PathVariable("id")Long id){ return emergencyTeamService.getEmergencyTeamById(id); } + + /** + * 应急队伍修改 + */ + @RequestMapping(value = "/update",method = RequestMethod.POST) + public ResultVO updateEmergencyTeam(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) { + String uid = principal.getName(); + return emergencyTeamService.updateEmergencyTeam(Long.valueOf(uid), emergencyTeamReqDTO); + } + + /** + * 应急队伍删除/批量删除 + */ + @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET) + public ResultVO batchDeleteEmergencyTeam(@PathVariable("ids")String ids){ + return emergencyTeamService.batchDeleteEmergencyTeam(ids); + } + + /** + * 应急队伍修改(应急人员新增) + */ + @RequestMapping(value = "/addMember",method = RequestMethod.POST) + public ResultVO addEmergencyTeamMember(Principal principal, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) { + String uid = principal.getName(); + return emergencyTeamService.addEmergencyTeamMember(Long.valueOf(uid), emergencyTeamMemberReqDTO); + } + + /** + * 应急队伍修改(应急人员详情) + */ + @RequestMapping(value = "/infoMember/{id}",method = RequestMethod.GET) + public ResultVO getEmergencyTeamMemberById(@PathVariable("id")Long id){ + return emergencyTeamService.getEmergencyTeamMemberById(id); + } + + /** + * 应急队伍修改(应急人员修改) + */ + @RequestMapping(value = "/updateMember",method = RequestMethod.POST) + public ResultVO updateEmergencyTeamMember(Principal principal, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) { + String uid = principal.getName(); + return emergencyTeamService.updateEmergencyTeamMember(Long.valueOf(uid), emergencyTeamMemberReqDTO); + } + /** + * 应急队伍修改(应急人员删除) + */ + @RequestMapping(value = "/deleteMember/{id}",method = RequestMethod.GET) + public ResultVO deleteEmergencyTeamMember(@PathVariable("id")Long id){ + return emergencyTeamService.deleteEmergencyTeamMember(id); + } + } -- Gitblit v1.9.2