From 37e34832eef478c240232b179597f7d671759d59 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 11 七月 2022 09:01:50 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 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..2d677b9 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,21 @@
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.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.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;
@@ -41,5 +47,47 @@
return accountUserService.getDepList(Long.valueOf(userId), depId);
}
+ /**
+ * @Description: 个人信息
+ */
+ @RequestMapping(value = "/personal", method = RequestMethod.GET)
+ public ResultVO<PersonalDetailRPCRespDTO> getPersonal(Principal principal) {
+ String userId = principal.getName();
+ return accountUserService.getPersonalAccountDetail(Long.valueOf(userId));
+ }
+
+ /**
+ * @Description: 新增用户信息
+ */
+ @RequestMapping(value = "/add", method = RequestMethod.POST)
+ @PreAuthorize("hasRole('ROLE_admin')")
+ public ResultVO<String> addUser(Principal principal, @RequestBody AccountAddRPCReqDTO accountAddRPCReqDTO) {
+ String userId = principal.getName();
+ return accountUserService.addAccount(Long.valueOf(userId), 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