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/EmergencyTeamController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
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