From 44163ffec2f7a1f4c428cebc2aa5577f1f45e0b5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 15:28:41 +0800
Subject: [PATCH] 应急计划发布fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillPlanController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..5c95351 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,9 +53,9 @@
* 应急演练计划修改
*/
@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);
}
/**
--
Gitblit v1.9.2