From dd4cd96c69061da3ff80cbfb87237b16cda8abc3 Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期五, 26 九月 2025 18:48:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao --- server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java index ee08d1b..23bac9c 100644 --- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java +++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java @@ -2,21 +2,22 @@ import com.doumee.api.BaseController; import com.doumee.biz.system.SystemRoleBiz; +import com.doumee.config.annotation.CloudRequiredPermission; import com.doumee.core.annotation.pr.PreventRepeat; 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.CreateRoleMenuDTO; import com.doumee.dao.system.dto.CreateRolePermissionDTO; import com.doumee.dao.system.dto.QuerySystemRoleDTO; +import com.doumee.dao.system.model.SystemDataPermission; import com.doumee.dao.system.model.SystemRole; import com.doumee.dao.system.vo.SystemRoleListVO; import com.doumee.service.system.SystemRoleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -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.*; @@ -29,7 +30,7 @@ */ @Api(tags = "绯荤粺瑙掕壊") @RestController -@RequestMapping("/cloudService/system/role") +@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/role") public class SystemRoleCloudController extends BaseController { @Autowired @@ -41,8 +42,9 @@ @PreventRepeat @ApiOperation("閰嶇疆瑙掕壊鑿滃崟") @PostMapping("/createRoleMenu") - @RequiresPermissions("system:role:createRoleMenu") + @CloudRequiredPermission("system:role:createRoleMenu") public ApiResponse createRoleMenu (@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated @RequestBody CreateRoleMenuDTO dto) { + dto.setCreateUser(this.getLoginUser(token).getId()); systemRoleBiz.createRoleMenu(dto); return ApiResponse.success(null); } @@ -50,23 +52,35 @@ @PreventRepeat @ApiOperation("閰嶇疆瑙掕壊鏉冮檺") @PostMapping("/createRolePermission") - @RequiresPermissions("system:role:createRolePermission") + @CloudRequiredPermission("system:role:createRolePermission") public ApiResponse createRolePermission (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody CreateRolePermissionDTO dto) { + dto.setCreateUser(this.getLoginUser(token).getId()); systemRoleBiz.createRolePermission(dto); + return ApiResponse.success(null); + } + + @PreventRepeat + @ApiOperation("閰嶇疆瑙掕壊鏁版嵁鏉冮檺") + @PostMapping("/createRoleDataPermission") + @CloudRequiredPermission("system:datapermission:create") + public ApiResponse createRoleDataPermission (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody SystemDataPermission dto) { + dto.setLoginUserInfo(this.getLoginUser(token)); + systemRoleBiz.createRoleDataPermission(dto); return ApiResponse.success(null); } @PreventRepeat @ApiOperation("鏂板缓") @PostMapping("/create") - @RequiresPermissions("system:role:create") + @CloudRequiredPermission("system:role:create") public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) { + systemRole.setCreateUser(this.getLoginUser(token).getId()); return ApiResponse.success(systemRoleBiz.create(systemRole)); } @ApiOperation("鍒犻櫎") @GetMapping("/delete/{id}") - @RequiresPermissions("system:role:delete") + @CloudRequiredPermission("system:role:delete") public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) { systemRoleBiz.deleteById(id); return ApiResponse.success(null); @@ -74,7 +88,7 @@ @ApiOperation("鎵归噺鍒犻櫎") @GetMapping("/delete/batch") - @RequiresPermissions("system:role:delete") + @CloudRequiredPermission("system:role:delete") public ApiResponse deleteByIdInBatch(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String ids) { String [] idArray = ids.split(","); List<Integer> idList = new ArrayList<>(); @@ -87,22 +101,23 @@ @ApiOperation("淇敼") @PostMapping("/updateById") - @RequiresPermissions("system:role:update") + @CloudRequiredPermission("system:role:update") public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemRole systemRole) { + systemRole.setUpdateUser(this.getLoginUser(token).getId()); systemRoleBiz.updateById(systemRole); return ApiResponse.success(null); } @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") - @RequiresPermissions("system:role:query") + @CloudRequiredPermission("system:role:query") public ApiResponse<PageData<SystemRoleListVO>> findPage (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestBody PageWrap<QuerySystemRoleDTO> pageWrap) { return ApiResponse.success(systemRoleService.findPage(pageWrap)); } @ApiOperation("鏌ヨ鎵�鏈�") @GetMapping("/all") - @RequiresPermissions("system:role:query") + @CloudRequiredPermission("system:role:query") public ApiResponse<List<SystemRole>> findAll (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { SystemRole systemRole = new SystemRole(); systemRole.setDeleted(Boolean.FALSE); -- Gitblit v1.9.3