From 95c5a1da43d63a67e5ec35ed23b5eafabfc325f6 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 18 七月 2022 10:30:48 +0800
Subject: [PATCH] controller修改
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java | 14 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java | 14 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 26 ++++----
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillPlanController.java | 14 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java | 14 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java | 14 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java | 14 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java | 14 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillEvaluationController.java | 15 ++--
9 files changed, 78 insertions(+), 61 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..62cfcea 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
@@ -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);
}
/**
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
index 0ffb6b8..c5c2429 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.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.EmergencyDrillExecuteQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillExecuteService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -34,9 +36,9 @@
* 应急演练实施新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencyDrillExecute(Principal principal, @RequestBody EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO) {
- String uid = principal.getName();
- return emergencyDrillExecuteService.addEmergencyDrillExecute(Long.valueOf(uid), emergencyDrillExecuteReqDTO);
+ public ResultVO addEmergencyDrillExecute(Authentication authentication, @RequestBody EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyDrillExecuteService.addEmergencyDrillExecute(currentUser.getUid(), emergencyDrillExecuteReqDTO);
}
/**
@@ -51,9 +53,9 @@
* 应急演练实施修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencyDrillExecute(Principal principal, @RequestBody EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO) {
- String uid = principal.getName();
- return emergencyDrillExecuteService.updateEmergencyDrillExecute(Long.valueOf(uid), emergencyDrillExecuteReqDTO);
+ public ResultVO updateEmergencyDrillExecute(Authentication authentication, @RequestBody EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyDrillExecuteService.updateEmergencyDrillExecute(currentUser.getUid(), emergencyDrillExecuteReqDTO);
}
/**
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..144c55c 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;
@@ -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);
}
/**
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
index d7b4ff1..287a79e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.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.EmergencyPlanQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -34,9 +36,9 @@
* 应急预案新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencyPlan(Principal principal, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
- String uid = principal.getName();
- return emergencyPlanService.addEmergencyPlan(Long.valueOf(uid), emergencyPlanReqDTO);
+ public ResultVO addEmergencyPlan(Authentication authentication, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanService.addEmergencyPlan(currentUser.getUid(), emergencyPlanReqDTO);
}
/**
@@ -51,9 +53,9 @@
* 应急预案修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencyPlan(Principal principal, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
- String uid = principal.getName();
- return emergencyPlanService.updateEmergencyPlan(Long.valueOf(uid), emergencyPlanReqDTO);
+ public ResultVO updateEmergencyPlan(Authentication authentication, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanService.updateEmergencyPlan(currentUser.getUid(), emergencyPlanReqDTO);
}
/**
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..467826b 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;
@@ -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);
}
/**
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..ae1e471 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;
@@ -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,9 +53,9 @@
* 应急预案修改
*/
@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);
}
/**
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java
index 07ccce4..600e487 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.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.EmergencySuppliesInspectQuery;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesInspectService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -34,9 +36,9 @@
* 应急物资检查新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencySuppliesInspect(Principal principal, @RequestBody EmergencySuppliesInspectReqDTO emergencySuppliesInspectReqDTO) {
- String uid = principal.getName();
- return emergencySuppliesInspectService.addEmergencySuppliesInspect(Long.valueOf(uid), emergencySuppliesInspectReqDTO);
+ public ResultVO addEmergencySuppliesInspect(Authentication authentication, @RequestBody EmergencySuppliesInspectReqDTO emergencySuppliesInspectReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesInspectService.addEmergencySuppliesInspect(currentUser.getUid(), emergencySuppliesInspectReqDTO);
}
/**
@@ -51,9 +53,9 @@
* 应急物资检查修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencySuppliesInspect(Principal principal, @RequestBody EmergencySuppliesInspectReqDTO emergencySuppliesInspectReqDTO) {
- String uid = principal.getName();
- return emergencySuppliesInspectService.updateEmergencySuppliesInspect(Long.valueOf(uid), emergencySuppliesInspectReqDTO);
+ public ResultVO updateEmergencySuppliesInspect(Authentication authentication, @RequestBody EmergencySuppliesInspectReqDTO emergencySuppliesInspectReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesInspectService.updateEmergencySuppliesInspect(currentUser.getUid(), emergencySuppliesInspectReqDTO);
}
/**
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
index a076582..16b2d34 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.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.EmergencySuppliesMaintainQuery;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesMaintainService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -34,9 +36,9 @@
* 应急物资检查新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencySuppliesMaintain(Principal principal, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
- String uid = principal.getName();
- return emergencySuppliesMaintainService.addEmergencySuppliesMaintain(Long.valueOf(uid), emergencySuppliesMaintainReqDTO);
+ public ResultVO addEmergencySuppliesMaintain(Authentication authentication, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesMaintainService.addEmergencySuppliesMaintain(currentUser.getUid(), emergencySuppliesMaintainReqDTO);
}
/**
@@ -51,9 +53,9 @@
* 应急物资检查修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencySuppliesMaintain(Principal principal, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
- String uid = principal.getName();
- return emergencySuppliesMaintainService.updateEmergencySuppliesMaintain(Long.valueOf(uid), emergencySuppliesMaintainReqDTO);
+ public ResultVO updateEmergencySuppliesMaintain(Authentication authentication, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesMaintainService.updateEmergencySuppliesMaintain(currentUser.getUid(), emergencySuppliesMaintainReqDTO);
}
/**
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
index 763020f..3951ce8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.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;
@@ -10,6 +11,7 @@
import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyTeamService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -35,9 +37,9 @@
* 应急队伍新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencyTeam(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
- String uid = principal.getName();
- return emergencyTeamService.addEmergencyTeam(Long.valueOf(uid), emergencyTeamReqDTO);
+ public ResultVO addEmergencyTeam(Authentication authentication, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyTeamService.addEmergencyTeam(currentUser.getUid(), emergencyTeamReqDTO);
}
/**
@@ -52,9 +54,9 @@
* 应急队伍修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencyTeam(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
- String uid = principal.getName();
- return emergencyTeamService.updateEmergencyTeam(Long.valueOf(uid), emergencyTeamReqDTO);
+ public ResultVO updateEmergencyTeam(Authentication authentication, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyTeamService.updateEmergencyTeam(currentUser.getUid(), emergencyTeamReqDTO);
}
/**
@@ -69,9 +71,9 @@
* 应急队伍修改（应急人员新增）
*/
@RequestMapping(value = "/addMember",method = RequestMethod.POST)
- public ResultVO addEmergencyTeamMember(Principal principal, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) {
- String uid = principal.getName();
- return emergencyTeamService.addEmergencyTeamMember(Long.valueOf(uid), emergencyTeamMemberReqDTO);
+ public ResultVO addEmergencyTeamMember(Authentication authentication, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyTeamService.addEmergencyTeamMember(currentUser.getUid(), emergencyTeamMemberReqDTO);
}
/**
@@ -86,9 +88,9 @@
* 应急队伍修改（应急人员修改）
*/
@RequestMapping(value = "/updateMember",method = RequestMethod.POST)
- public ResultVO updateEmergencyTeamMember(Principal principal, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) {
- String uid = principal.getName();
- return emergencyTeamService.updateEmergencyTeamMember(Long.valueOf(uid), emergencyTeamMemberReqDTO);
+ public ResultVO updateEmergencyTeamMember(Authentication authentication, @RequestBody EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyTeamService.updateEmergencyTeamMember(currentUser.getUid(), emergencyTeamMemberReqDTO);
}
/**
* 应急队伍修改（应急人员删除）
--
Gitblit v1.9.2