From 701d5ca0fb3da20fb336d66e08f4aa3c6b85c731 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 29 十一月 2024 09:37:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
index 815f5c7..882d368 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
@@ -9,6 +9,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.CreateSystemUserDTO;
 import com.doumee.dao.system.dto.CreateUserRoleDTO;
 import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -31,7 +32,7 @@
  */
 @Api(tags = "鐢ㄦ埛")
 @RestController
-@RequestMapping("/cloudService/system/user")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/user")
 public class SystemUserCloudController extends BaseController {
 
     @Autowired
@@ -44,7 +45,8 @@
     @ApiOperation("閰嶇疆鐢ㄦ埛瑙掕壊")
     @PostMapping("/createUserRole")
     @CloudRequiredPermission("system:user:createUserRole")
-    public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
+    public ApiResponse createUserRole (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody CreateUserRoleDTO dto) {
+        dto.setCreateUser(this.getLoginUser(token).getId());
         systemUserBiz.createUserRole(dto);
         return ApiResponse.success(null);
     }
@@ -54,8 +56,8 @@
     @ApiOperation("閲嶇疆鐢ㄦ埛瀵嗙爜")
     @PostMapping("/resetPwd")
     @CloudRequiredPermission("system:user:resetPwd")
-    public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
-        dto.setOperaUserId(this.getLoginUser().getId());
+    public ApiResponse resetPwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody ResetSystemUserPwdDTO dto) {
+        dto.setOperaUserId(this.getLoginUser(token).getId());
         systemUserBiz.resetPwd(dto);
         return ApiResponse.success(null);
     }
@@ -65,8 +67,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("system:user:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
-        systemUser.setCreateUser(this.getLoginUser().getId());
+    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
+        systemUser.setCreateUser(this.getLoginUser(token).getId());
         systemUserBiz.create(systemUser);
         return ApiResponse.success(null);
     }
@@ -96,8 +98,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:user:update")
-    public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
-        systemUser.setUpdateUser(this.getLoginUser().getId());
+    public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @RequestBody CreateSystemUserDTO systemUser) {
+        systemUser.setUpdateUser(this.getLoginUser(token).getId());
         systemUserBiz.updateById(systemUser);
         return ApiResponse.success(null);
     }
@@ -110,9 +112,6 @@
     }
 
 
-
-
-
     @ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�")
     @PostMapping("/findAllList")
     @CloudRequiredPermission("system:user:query")
@@ -120,6 +119,12 @@
         return ApiResponse.success(systemUserService.findAllList(pageWrap));
     }
 
+    @ApiOperation("鏌ヨ鎵�鏈夊唴閮ㄤ汉鍛樼敤鎴�")
+    @PostMapping("/findInternalList")
+    @CloudRequiredPermission("system:user:query")
+    public ApiResponse<List<SystemUser>> findInternalList () {
+        return ApiResponse.success(systemUserService.findInternalList());
+    }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")

--
Gitblit v1.9.3