From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 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 a35d13a..1e7c84e 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 @@ -6,9 +6,9 @@ import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.constants.OperaType; -import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.system.dto.CreateSystemUserDTO; import com.doumee.dao.system.dto.CreateUserRoleDTO; @@ -45,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); } @@ -55,8 +56,9 @@ @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()); + dto.setNeedChangePwd(Constants.ZERO); systemUserBiz.resetPwd(dto); return ApiResponse.success(null); } @@ -66,8 +68,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); } @@ -97,8 +99,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,8 +112,12 @@ return ApiResponse.success(systemUserService.findPage(pageWrap)); } - - + @ApiOperation("鍒嗛〉鏌ヨ鍙告満鍒楄〃") + @PostMapping("/pageDriver") + @CloudRequiredPermission("system:user:query") + public ApiResponse<PageData<SystemUser>> findDriverPage (@RequestBody PageWrap<SystemUser> pageWrap) { + return ApiResponse.success(systemUserService.findDriverPage(pageWrap)); + } @ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�") @@ -121,6 +127,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