From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 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 f3e59f7..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
@@ -2,12 +2,14 @@
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemUserBiz;
+import com.doumee.config.annotation.CloudRequiredPermission;
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.core.utils.Constants;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -16,7 +18,6 @@
import com.doumee.dao.system.vo.SystemUserListVO;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.*;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -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
@@ -43,8 +44,9 @@
@PreventRepeat
@ApiOperation("閰嶇疆鐢ㄦ埛瑙掕壊")
@PostMapping("/createUserRole")
- @RequiresPermissions("system:user:createUserRole")
- public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
+ @CloudRequiredPermission("system:user:createUserRole")
+ 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);
}
@@ -53,9 +55,9 @@
@PreventRepeat
@ApiOperation("閲嶇疆鐢ㄦ埛瀵嗙爜")
@PostMapping("/resetPwd")
- @RequiresPermissions("system:user:resetPwd")
- public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
- dto.setOperaUserId(this.getLoginUser().getId());
+ @CloudRequiredPermission("system:user:resetPwd")
+ 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);
}
@@ -64,16 +66,16 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("system:user:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
- systemUser.setCreateUser(this.getLoginUser().getId());
+ @CloudRequiredPermission("system:user:create")
+ 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);
}
@ApiOperation("鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("system:user:delete")
+ @CloudRequiredPermission("system:user:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
systemUserBiz.deleteById(id);
return ApiResponse.success(null);
@@ -81,7 +83,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("system:user:delete")
+ @CloudRequiredPermission("system:user:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -95,42 +97,45 @@
@Trace(withRequestParameters = false)
@ApiOperation("淇敼")
@PostMapping("/updateById")
- @RequiresPermissions("system:user:update")
- public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
- systemUser.setUpdateUser(this.getLoginUser().getId());
+ @CloudRequiredPermission("system:user:update")
+ 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);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("system:user:query")
+ @CloudRequiredPermission("system:user:query")
public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
return ApiResponse.success(systemUserService.findPage(pageWrap));
}
-
-
-
@ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�")
@PostMapping("/findAllList")
- @RequiresPermissions("system:user:query")
+ @CloudRequiredPermission("system:user:query")
public ApiResponse<List<SystemUser>> findAllList (@RequestBody SystemUser pageWrap) {
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}")
- @RequiresPermissions("system:user:query")
+ @CloudRequiredPermission("system:user:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(systemUserService.findById(id));
}
@ApiOperation("鐢ㄦ埛瀵煎叆")
@PostMapping("/importSystemUserBatch")
- @RequiresPermissions("system:user:query")
+ @CloudRequiredPermission("system:user:query")
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
})
--
Gitblit v1.9.3