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/UserController.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java
index 48258a7..1573723 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java
@@ -1,15 +1,23 @@
package com.gkhy.safePlatform.accountController;
+import com.alibaba.fastjson.JSONObject;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountMenuService;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountUserService;
+import com.gkhy.safePlatform.account.rpc.apimodel.model.req.AccountAddRPCReqDTO;
+import com.gkhy.safePlatform.account.rpc.apimodel.model.req.AccountModRPCReqDTO;
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.query.AccountRPCQuery;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepUserRPCRespDTO;
+import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.PersonalDetailRPCRespDTO;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.security.access.prepost.PreAuthorize;
+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;
import org.springframework.web.bind.annotation.RestController;
@@ -27,8 +35,9 @@
@RequestMapping("/page/list")
- public Object getUserPage(Principal principal, PageQuery<AccountRPCQuery> rpcQueryPageQuery) {
- return accountUserService.getAccountPage(Long.valueOf(principal.getName()), rpcQueryPageQuery);
+ public Object getUserPage(Authentication authentication, PageQuery<AccountRPCQuery> rpcQueryPageQuery) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountUserService.getAccountPage(currentUser.getUid(), rpcQueryPageQuery);
}
@@ -36,10 +45,52 @@
* @Description: 获取部门下的用户列表
*/
@RequestMapping(value = "/dep/list", method = RequestMethod.GET)
- public ResultVO<List<DepUserRPCRespDTO>> depUserList(Principal principal, Long depId) {
- String userId = principal.getName();
- return accountUserService.getDepList(Long.valueOf(userId), depId);
+ public ResultVO<List<DepUserRPCRespDTO>> depUserList(Authentication authentication, Long depId) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountUserService.getDepList(currentUser.getUid(), depId);
+ }
+
+ /**
+ * @Description: 个人信息
+ */
+ @RequestMapping(value = "/personal", method = RequestMethod.GET)
+ public ResultVO<PersonalDetailRPCRespDTO> getPersonal(Authentication authentication) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountUserService.getPersonalAccountDetail(currentUser.getUid());
}
+ /**
+ * @Description: 新增用户信息
+ */
+ @RequestMapping(value = "/add", method = RequestMethod.POST)
+ @PreAuthorize("hasRole('ROLE_admin')")
+ public ResultVO<String> addUser(Authentication authentication, @RequestBody AccountAddRPCReqDTO accountAddRPCReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountUserService.addAccount(currentUser.getUid(), accountAddRPCReqDTO);
+ }
+
+
+ /**
+ * @Description: 修改用户信息
+ */
+
+ @RequestMapping(value = "/mod", method = RequestMethod.POST)
+ @PreAuthorize("hasRole('ROLE_admin')")
+ public ResultVO<String> modUser(Principal principal, @RequestBody AccountModRPCReqDTO accountModRPCReqDTO) {
+ String userId = principal.getName();
+ return accountUserService.modAccount(Long.valueOf(userId), accountModRPCReqDTO);
+ }
+
+
+ /**
+ * @Description: 删除用户信息
+ */
+ @RequestMapping(value = "/del", method = RequestMethod.POST)
+ @PreAuthorize("hasRole('ROLE_admin')")
+ public ResultVO<String> delUser(Principal principal, @RequestBody JSONObject json) {
+ Long uid = json.getLong("uid");
+ String userId = principal.getName();
+ return accountUserService.delAccount(Long.valueOf(userId), uid);
+ }
}
--
Gitblit v1.9.2