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/EmergencyDrillExecuteController.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
index 0ffb6b8..97060a4 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
@@ -1,5 +1,6 @@
 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;
@@ -9,9 +10,9 @@
 import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
 import com.gkhy.safePlatform.emergency.service.EmergencyDrillExecuteService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
-import java.security.Principal;
 import java.util.List;
 
 @RestController
@@ -26,7 +27,7 @@
      */
     @RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
     private ResultVO<List<EmergencyDrillExecutePageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillExecuteQuery> pageQuery){
-        PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
+        PageUtils.checkCheck(pageQuery);
         return  emergencyDrillExecuteService.selectEmergencyDrillExecuteList(pageQuery);
     }
 
@@ -34,9 +35,9 @@
      * 应急演练实施新增
      */
     @RequestMapping(value = "/add",method = RequestMethod.POST)
-    public ResultVO addEmergencyDrillExecute(Principal principal, @RequestBody EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO) {
-        String uid = principal.getName();
-        return emergencyDrillExecuteService.addEmergencyDrillExecute(Long.valueOf(uid), emergencyDrillExecuteReqDTO);
+    public ResultVO addEmergencyDrillExecute(Authentication authentication, @RequestBody EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO) {
+          ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+        return emergencyDrillExecuteService.addEmergencyDrillExecute(currentUser.getUid(), emergencyDrillExecuteReqDTO);
     }
 
     /**
@@ -51,16 +52,17 @@
      * 应急演练实施修改
      */
     @RequestMapping(value = "/update",method = RequestMethod.POST)
-    public ResultVO updateEmergencyDrillExecute(Principal principal, @RequestBody EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO) {
-        String uid = principal.getName();
-        return emergencyDrillExecuteService.updateEmergencyDrillExecute(Long.valueOf(uid), emergencyDrillExecuteReqDTO);
+    public ResultVO updateEmergencyDrillExecute(Authentication authentication, @RequestBody EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO) {
+          ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+        return emergencyDrillExecuteService.updateEmergencyDrillExecute(currentUser.getUid(), emergencyDrillExecuteReqDTO);
     }
 
     /**
      * 应急演练实施删除/批量删除
      */
-    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
-    public ResultVO batchDeleteEmergencyDrillExecute(@PathVariable("ids")String ids){
+    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+    public ResultVO batchDeleteEmergencyDrillExecute(@RequestBody Long[] ids){
         return emergencyDrillExecuteService.batchDeleteEmergencyDrillExecute(ids);
     }
+
 }

--
Gitblit v1.9.2