From 0414ddb0b2b3a7199ae6181a770f97ac140dbd73 Mon Sep 17 00:00:00 2001 From: zhangf <1603559716@qq.com> Date: 星期三, 08 五月 2024 16:46:22 +0800 Subject: [PATCH] spi统计 --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 86 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 77 insertions(+), 9 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 42e2add..0eddfed 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 @@ -1,17 +1,19 @@ package com.gkhy.safePlatform.emergency.controller; +import com.gkhy.safePlatform.commons.co.ContextCacheUser; 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.EmergencyTeamMemberRespDTO; 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.security.core.Authentication; +import org.springframework.web.bind.annotation.*; import java.security.Principal; import java.util.List; @@ -28,17 +30,83 @@ */ @RequestMapping(value = "/page/list" ,method = RequestMethod.POST) private ResultVO<List<EmergencyTeamPageRespDTO>> list (@RequestBody PageQuery<EmergencyTeamQuery> pageQuery){ - PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize()); + PageUtils.checkCheck(pageQuery); return emergencyTeamService.selectEmergencyTeamList(pageQuery); } /** - * 新增应急预案 + * 应急队伍新增 */ @RequestMapping(value = "/add",method = RequestMethod.POST) - public ResultVO<String> add(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) { - String uid = principal.getName(); - return emergencyTeamService.add(Long.valueOf(uid), emergencyTeamReqDTO); + public ResultVO<EmergencyTeamDetailRespDTO> addEmergencyTeam(Authentication authentication, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); + return emergencyTeamService.addEmergencyTeam(currentUser.getUid(), emergencyTeamReqDTO); + } + + /** + * 应急队伍详情 + */ + @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(Authentication authentication, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); + return emergencyTeamService.updateEmergencyTeam(currentUser.getUid(), emergencyTeamReqDTO); + } + + /** + * 应急队伍删除/批量删除 + */ + @RequestMapping(value = "/batchDelete",method = RequestMethod.POST) + public ResultVO batchDeleteEmergencyTeam(@RequestBody Long[] ids){ + return emergencyTeamService.batchDeleteEmergencyTeam(ids); + } + + /** + * 应急队伍修改(应急人员列表) + */ + @RequestMapping(value = "/memberList/{teamId}",method = RequestMethod.GET) + public ResultVO getEmergencyTeamMemberByTeamId(@PathVariable("teamId")Long teamId){ + return emergencyTeamService.getEmergencyTeamMemberByTeamId(teamId); + } + + /** + * 应急队伍修改(应急人员新增) + */ + @RequestMapping(value = "/addMember",method = RequestMethod.POST) + public ResultVO addEmergencyTeamMember(Authentication authentication, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); + return emergencyTeamService.addEmergencyTeamMember(currentUser.getUid(), 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(Authentication authentication, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); + return emergencyTeamService.updateEmergencyTeamMember(currentUser.getUid(), emergencyTeamMemberReqDTO); + } + /** + * 应急队伍修改(应急人员删除) + */ + @RequestMapping(value = "/deleteMember/{id}",method = RequestMethod.GET) + public ResultVO deleteEmergencyTeamMember(@PathVariable("id")Long id){ + return emergencyTeamService.deleteEmergencyTeamMember(id); } } -- Gitblit v1.9.2