From aace11a7e1201a8d1fc0b50b659368918d23e794 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 02 八月 2022 16:43:59 +0800
Subject: [PATCH] 一览接口fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
index 80be12a..4bdbf04 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.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;
@@ -8,6 +9,7 @@
import com.gkhy.safePlatform.emergency.query.EmergencyPlanLogQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyPlanLogService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -25,7 +27,7 @@
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
private ResultVO<List<EmergencyPlanLogRespDTO>> list (@RequestBody PageQuery<EmergencyPlanLogQuery> pageQuery){
- PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
+ PageUtils.checkCheck(pageQuery);
return emergencyPlanLogService.selectEmergencyPlanLogList(pageQuery);
}
@@ -33,9 +35,9 @@
* 应急预案启动记录新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencyPlanLog(Principal principal, @RequestBody EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
- String uid = principal.getName();
- return emergencyPlanLogService.addEmergencyPlanLog(Long.valueOf(uid), emergencyPlanLogReqDTO);
+ public ResultVO addEmergencyPlanLog(Authentication authentication, @RequestBody EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanLogService.addEmergencyPlanLog(currentUser.getUid(), emergencyPlanLogReqDTO);
}
/**
@@ -50,9 +52,9 @@
* 应急预案修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencyPlanLog(Principal principal, @RequestBody EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
- String uid = principal.getName();
- return emergencyPlanLogService.updateEmergencyPlanLog(Long.valueOf(uid), emergencyPlanLogReqDTO);
+ public ResultVO updateEmergencyPlanLog(Authentication authentication, @RequestBody EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanLogService.updateEmergencyPlanLog(currentUser.getUid(), emergencyPlanLogReqDTO);
}
/**
--
Gitblit v1.9.2