From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 16 一月 2025 16:52:46 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java index b1c5efd..778d723 100644 --- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java +++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java @@ -2,20 +2,20 @@ import com.doumee.api.BaseController; import com.doumee.biz.system.SystemDataPermissionBiz; +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.DataPermissionConstants; 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.model.SystemDataPermission; import com.doumee.dao.system.vo.SystemDataPermissionListVO; import com.doumee.service.system.SystemDataPermissionService; 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.*; @@ -38,11 +38,16 @@ @Autowired private SystemDataPermissionBiz systemDataPermissionBiz; - + @ApiOperation("鏍规嵁roleId鏌ヨ浼佷笟鏁版嵁鏉冮檺") + @PostMapping("/findByRoleId") + @CloudRequiredPermission("system:datapermission:query") + public ApiResponse<SystemDataPermission> findByRoleId (@RequestBody SystemDataPermission pageWrap) { + return ApiResponse.success(systemDataPermissionService.findByRoleId(pageWrap)); + } @PreventRepeat @ApiOperation("鏂板缓") @PostMapping("/create") - @RequiresPermissions("system:datapermission:create") + @CloudRequiredPermission("system:datapermission:create") public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemDataPermission systemDataPermission) { systemDataPermission.setCreateUser(this.getLoginUser(token).getId()); return ApiResponse.success(systemDataPermissionBiz.create(systemDataPermission)); @@ -50,7 +55,7 @@ @ApiOperation("鏍规嵁ID鍒犻櫎") @GetMapping("/delete/{id}") - @RequiresPermissions("system:datapermission:delete") + @CloudRequiredPermission("system:datapermission:delete") public ApiResponse deleteById(@PathVariable Integer id) { systemDataPermissionService.deleteById(id); return ApiResponse.success(null); @@ -58,7 +63,7 @@ @ApiOperation("鎵归噺鍒犻櫎") @GetMapping("/delete/batch") - @RequiresPermissions("system:datapermission:delete") + @CloudRequiredPermission("system:datapermission:delete") public ApiResponse deleteByIdInBatch(@RequestParam String ids) { String [] idArray = ids.split(","); List<Integer> idList = new ArrayList<>(); @@ -71,25 +76,25 @@ @ApiOperation("淇敼") @PostMapping("/updateById") - @RequiresPermissions("system:datapermission:update") + @CloudRequiredPermission("system:datapermission:update") public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDataPermission systemDataPermission) { - systemDataPermission.setCreateUser(this.getLoginUser(token).getId()); + systemDataPermission.setUpdateUser(this.getLoginUser(token).getId()); systemDataPermissionBiz.update(systemDataPermission); return ApiResponse.success(null); } @ApiOperation("淇敼鐘舵��") @PostMapping("/updateStatus") - @RequiresPermissions("system:datapermission:update") + @CloudRequiredPermission("system:datapermission:update") public ApiResponse updateStatus(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.UpdateStatus.class) @RequestBody SystemDataPermission systemDataPermission) { - systemDataPermission.setCreateUser(this.getLoginUser(token).getId()); + systemDataPermission.setLoginUserInfo(this.getLoginUser(token)); systemDataPermissionBiz.updateStatus(systemDataPermission); return ApiResponse.success(null); } @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") - @RequiresPermissions("system:datapermission:query") + @CloudRequiredPermission("system:datapermission:query") public ApiResponse<PageData<SystemDataPermissionListVO>> findPage (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestBody PageWrap<SystemDataPermission> pageWrap) { return ApiResponse.success(systemDataPermissionService.findPage(pageWrap)); } -- Gitblit v1.9.3