From ecc4aa55714c96ca7c906cd461a464d1f00cb47f Mon Sep 17 00:00:00 2001 From: liyang <liyang1987jay@163.com> Date: 星期二, 12 七月 2022 21:00:55 +0800 Subject: [PATCH] 修改方法描述 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 48 ++++++++++++++++++------------------------------ 1 files changed, 18 insertions(+), 30 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 967635e..08aeb2d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -18,11 +18,6 @@ import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.SysPermissionService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,7 +31,6 @@ * @author Lion Li */ @Validated -@Tag(name ="瑙掕壊淇℃伅鎺у埗鍣�", description = "瑙掕壊淇℃伅绠$悊") @RequiredArgsConstructor @RestController @RequestMapping("/system/role") @@ -46,14 +40,18 @@ private final ISysUserService userService; private final SysPermissionService permissionService; - @Operation(summary = "鏌ヨ瑙掕壊淇℃伅鍒楄〃") + /** + * 鑾峰彇瑙掕壊淇℃伅鍒楄〃 + */ @SaCheckPermission("system:role:list") @GetMapping("/list") public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) { return roleService.selectPageRoleList(role, pageQuery); } - @Operation(summary = "瀵煎嚭瑙掕壊淇℃伅鍒楄〃") + /** + * 瀵煎嚭瑙掕壊淇℃伅鍒楄〃 + */ @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.EXPORT) @SaCheckPermission("system:role:export") @PostMapping("/export") @@ -64,11 +62,12 @@ /** * 鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅 + * + * @param roleId 瑙掕壊ID */ - @Operation(summary = "鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅") @SaCheckPermission("system:role:query") @GetMapping(value = "/{roleId}") - public R<SysRole> getInfo(@Parameter(name = "瑙掕壊ID") @PathVariable Long roleId) { + public R<SysRole> getInfo(@PathVariable Long roleId) { roleService.checkRoleDataScope(roleId); return R.ok(roleService.selectRoleById(roleId)); } @@ -76,7 +75,6 @@ /** * 鏂板瑙掕壊 */ - @Operation(summary = "鏂板瑙掕壊") @SaCheckPermission("system:role:add") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.INSERT) @PostMapping @@ -93,7 +91,6 @@ /** * 淇敼淇濆瓨瑙掕壊 */ - @Operation(summary = "淇敼淇濆瓨瑙掕壊") @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.UPDATE) @PutMapping @@ -122,7 +119,6 @@ /** * 淇敼淇濆瓨鏁版嵁鏉冮檺 */ - @Operation(summary = "淇敼淇濆瓨鏁版嵁鏉冮檺") @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") @@ -135,7 +131,6 @@ /** * 鐘舵�佷慨鏀� */ - @Operation(summary = "鐘舵�佷慨鏀�") @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") @@ -147,19 +142,19 @@ /** * 鍒犻櫎瑙掕壊 + * + * @param roleIds 瑙掕壊ID涓� */ - @Operation(summary = "鍒犻櫎瑙掕壊") @SaCheckPermission("system:role:remove") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") - public R<Void> remove(@Parameter(name = "瑙掕壊ID涓�") @PathVariable Long[] roleIds) { + public R<Void> remove(@PathVariable Long[] roleIds) { return toAjax(roleService.deleteRoleByIds(roleIds)); } /** * 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛� */ - @Operation(summary = "鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�") @SaCheckPermission("system:role:query") @GetMapping("/optionselect") public R<List<SysRole>> optionselect() { @@ -169,7 +164,6 @@ /** * 鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛� */ - @Operation(summary = "鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�") @SaCheckPermission("system:role:list") @GetMapping("/authUser/allocatedList") public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) { @@ -179,7 +173,6 @@ /** * 鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛� */ - @Operation(summary = "鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�") @SaCheckPermission("system:role:list") @GetMapping("/authUser/unallocatedList") public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) { @@ -189,7 +182,6 @@ /** * 鍙栨秷鎺堟潈鐢ㄦ埛 */ - @Operation(summary = "鍙栨秷鎺堟潈鐢ㄦ埛") @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") @@ -199,12 +191,10 @@ /** * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛 + * + * @param roleId 瑙掕壊ID + * @param userIds 鐢ㄦ埛ID涓� */ - @Operation(summary = "鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛") - @Parameters({ - @Parameter(name = "roleId", description = "瑙掕壊ID", in = ParameterIn.QUERY), - @Parameter(name = "userIds", description = "鐢ㄦ埛ID涓�", in = ParameterIn.QUERY) - }) @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") @@ -214,12 +204,10 @@ /** * 鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈 + * + * @param roleId 瑙掕壊ID + * @param userIds 鐢ㄦ埛ID涓� */ - @Operation(summary = "鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈") - @Parameters({ - @Parameter(name = "roleId", description = "瑙掕壊ID", in = ParameterIn.QUERY), - @Parameter(name = "userIds", description = "鐢ㄦ埛ID涓�", in = ParameterIn.QUERY) - }) @SaCheckPermission("system:role:edit") @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") -- Gitblit v1.9.3