From 833893d56463f64332d5f5a3abcf774e8ad3f9c5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 19 七月 2022 17:31:33 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 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 31eb0bf..3951ce8 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,14 +1,17 @@
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.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.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -34,9 +37,9 @@
* 应急队伍新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencyTeam(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
- String uid = principal.getName();
- return emergencyTeamService.addEmergencyTeam(Long.valueOf(uid), emergencyTeamReqDTO);
+ public ResultVO addEmergencyTeam(Authentication authentication, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyTeamService.addEmergencyTeam(currentUser.getUid(), emergencyTeamReqDTO);
}
/**
@@ -46,4 +49,55 @@
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/{ids}",method = RequestMethod.GET)
+ public ResultVO batchDeleteEmergencyTeam(@PathVariable("ids")String ids){
+ return emergencyTeamService.batchDeleteEmergencyTeam(ids);
+ }
+
+ /**
+ * 应急队伍修改（应急人员新增）
+ */
+ @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