From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 4 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..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,14 +1,18 @@
 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.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
 import java.security.Principal;
@@ -26,7 +30,7 @@
      */
     @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);
     }
 
@@ -34,9 +38,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<EmergencyTeamDetailRespDTO> addEmergencyTeam(Authentication authentication, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
+        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+        return emergencyTeamService.addEmergencyTeam(currentUser.getUid(), emergencyTeamReqDTO);
     }
 
     /**
@@ -46,4 +50,63 @@
     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