From 00e40ce8b1de4da44d427a80f46d69fb90a9c075 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期一, 18 七月 2022 09:02:10 +0800 Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang --- safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java index 3bc2502..b44713c 100644 --- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java +++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java @@ -6,9 +6,11 @@ import com.gkhy.safePlatform.account.rpc.apimodel.model.req.DepAddRPCReqDTO; import com.gkhy.safePlatform.account.rpc.apimodel.model.req.DepModRPCReqDTO; import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepRPCRespDTO; +import com.gkhy.safePlatform.commons.co.ContextCacheUser; import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.vo.ResultVO; import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -33,24 +35,24 @@ @RequestMapping(value = "/add", method = RequestMethod.POST) - public ResultVO<String> addDepartment(Principal principal, @RequestBody DepAddRPCReqDTO depAddRPCReqDTO) { - String userId = principal.getName(); - return accountDepartmentService.addDep(Long.valueOf(userId) , depAddRPCReqDTO); + public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepAddRPCReqDTO depAddRPCReqDTO) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); + return accountDepartmentService.addDep(currentUser.getUid(), depAddRPCReqDTO); } @RequestMapping(value = "/mod", method = RequestMethod.POST) - public ResultVO<String> addDepartment(Principal principal, @RequestBody DepModRPCReqDTO depModRPCReqDTO) { - String userId = principal.getName(); - return accountDepartmentService.modDep(Long.valueOf(userId) , depModRPCReqDTO); + public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepModRPCReqDTO depModRPCReqDTO) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); + return accountDepartmentService.modDep(currentUser.getUid(), depModRPCReqDTO); } @RequestMapping(value = "/del", method = RequestMethod.POST) - public ResultVO<String> addDepartment(Principal principal, @RequestBody JSONObject json) { - String userId = principal.getName(); + public ResultVO<String> addDepartment(Authentication authentication, @RequestBody JSONObject json) { + ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); Long depId = json.getLong("depId"); - return accountDepartmentService.delDep(Long.valueOf(userId) , depId); + return accountDepartmentService.delDep(currentUser.getUid(), depId); } -- Gitblit v1.9.2