From c4354b452cb7b09fe28a9e8ea81f455df1c68de8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 05 八月 2022 17:02:59 +0800
Subject: [PATCH] 流程fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java
index e5b98c0..39648dd 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.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.EmergencySuppliesQuery;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesService;
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<EmergencySuppliesPageRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesQuery> pageQuery){
- PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
+ PageUtils.checkCheck(pageQuery);
return emergencySuppliesService.selectEmergencySuppliesList(pageQuery);
}
@@ -34,9 +36,9 @@
* 应急预案新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencySupplies(Principal principal, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
- String uid = principal.getName();
- return emergencySuppliesService.addEmergencySupplies(Long.valueOf(uid), emergencySuppliesReqDTO);
+ public ResultVO addEmergencySupplies(Authentication authentication, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesService.addEmergencySupplies(currentUser.getUid(), emergencySuppliesReqDTO);
}
/**
@@ -51,16 +53,16 @@
* 应急预案修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencySupplies(Principal principal, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
- String uid = principal.getName();
- return emergencySuppliesService.updateEmergencySupplies(Long.valueOf(uid), emergencySuppliesReqDTO);
+ public ResultVO updateEmergencySupplies(Authentication authentication, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesService.updateEmergencySupplies(currentUser.getUid(), emergencySuppliesReqDTO);
}
/**
* 应急预案删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencySupplies(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencySupplies(@RequestBody Long[] ids){
return emergencySuppliesService.batchDeleteEmergencySupplies(ids);
}
}
--
Gitblit v1.9.2