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/EmergencyDrillEvaluationController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java
index 5e9a17a..1af082e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.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.EmergencyDrillEvaluationQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillEvaluationService;
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<EmergencyDrillEvaluationPageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillEvaluationQuery> pageQuery){
- PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
+ PageUtils.checkCheck(pageQuery);
return emergencyDrillEvaluationService.selectEmergencyDrillEvaluationList(pageQuery);
}
@@ -34,9 +35,9 @@
* 应急演练实施评价新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencyDrillEvaluation(Principal principal, @RequestBody EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
- String uid = principal.getName();
- return emergencyDrillEvaluationService.addEmergencyDrillEvaluation(Long.valueOf(uid), emergencyDrillEvaluationReqDTO);
+ public ResultVO addEmergencyDrillEvaluation(Authentication authentication, @RequestBody EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyDrillEvaluationService.addEmergencyDrillEvaluation(currentUser.getUid(), emergencyDrillEvaluationReqDTO);
}
/**
@@ -51,9 +52,9 @@
* 应急演练实施评价修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencyDrillEvaluation(Principal principal, @RequestBody EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
- String uid = principal.getName();
- return emergencyDrillEvaluationService.updateEmergencyDrillEvaluation(Long.valueOf(uid), emergencyDrillEvaluationReqDTO);
+ public ResultVO updateEmergencyDrillEvaluation(Authentication authentication, @RequestBody EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyDrillEvaluationService.updateEmergencyDrillEvaluation(currentUser.getUid(), emergencyDrillEvaluationReqDTO);
}
/**
--
Gitblit v1.9.2