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/EmergencyDrillPlanController.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillPlanController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillPlanController.java index 08443a2..819172c 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillPlanController.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillPlanController.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,6 +10,7 @@ import com.gkhy.safePlatform.emergency.query.EmergencyDrillPlanQuery; import com.gkhy.safePlatform.emergency.service.EmergencyDrillPlanService; 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 +28,7 @@ */ @RequestMapping(value = "/page/list" ,method = RequestMethod.POST) private ResultVO<List<EmergencyDrillPlanPageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillPlanQuery> pageQuery){ - PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize()); + PageUtils.checkCheck(pageQuery); return emergencyDrillPlanService.selectEmergencyDrillPlanList(pageQuery); } @@ -34,9 +36,9 @@ * 应急演练计划新增 */ @RequestMapping(value = "/add",method = RequestMethod.POST) - public ResultVO addEmergencyDrillPlan(Principal principal, @RequestBody EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) { - String uid = principal.getName(); - return emergencyDrillPlanService.addEmergencyDrillPlan(Long.valueOf(uid), emergencyDrillPlanReqDTO); + public ResultVO addEmergencyDrillPlan(Authentication authentication, @RequestBody EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); + return emergencyDrillPlanService.addEmergencyDrillPlan(currentUser.getUid(), emergencyDrillPlanReqDTO); } /** @@ -51,16 +53,16 @@ * 应急演练计划修改 */ @RequestMapping(value = "/update",method = RequestMethod.POST) - public ResultVO updateEmergencyDrillPlan(Principal principal, @RequestBody EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) { - String uid = principal.getName(); - return emergencyDrillPlanService.updateEmergencyDrillPlan(Long.valueOf(uid), emergencyDrillPlanReqDTO); + public ResultVO updateEmergencyDrillPlan(Authentication authentication, @RequestBody EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); + return emergencyDrillPlanService.updateEmergencyDrillPlan(currentUser.getUid(), emergencyDrillPlanReqDTO); } /** * 应急演练计划删除/批量删除 */ - @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET) - public ResultVO batchDeleteEmergencyDrillPlan(@PathVariable("ids")String ids){ + @RequestMapping(value = "/batchDelete",method = RequestMethod.POST) + public ResultVO batchDeleteEmergencyDrillPlan(@RequestBody Long[] ids){ return emergencyDrillPlanService.batchDeleteEmergencyDrillPlan(ids); } } -- Gitblit v1.9.2