From 44e3fff279df82f38aada6f1eda65dcad895ebbc Mon Sep 17 00:00:00 2001
From: horizons <1490493387@qq.com>
Date: Thu, 27 Oct 2022 01:32:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A7=92=E8=89=B2=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E8=8E=B7=E5=8F=96=E5=92=8C=E4=BF=9D=E5=AD=98=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysRoleController.java  | 34 +++++++++----------
 .../youlai/system/service/SysRoleService.java |  6 ++--
 .../service/impl/SysRoleServiceImpl.java      | 12 +++----
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/youlai/system/controller/SysRoleController.java b/src/main/java/com/youlai/system/controller/SysRoleController.java
index 6b57c556..e34dd5c5 100644
--- a/src/main/java/com/youlai/system/controller/SysRoleController.java
+++ b/src/main/java/com/youlai/system/controller/SysRoleController.java
@@ -25,19 +25,19 @@ import java.util.List;
 @RequiredArgsConstructor
 public class SysRoleController {
 
-    private final SysRoleService sysRoleService;
+    private final SysRoleService roleService;
 
     @ApiOperation(value = "角色分页列表")
     @GetMapping("/pages")
     public PageResult<RolePageVO> listRolePages(RolePageQuery queryParams) {
-        Page<RolePageVO> result = sysRoleService.listRolePages(queryParams);
+        Page<RolePageVO> result = roleService.listRolePages(queryParams);
         return PageResult.success(result);
     }
 
     @ApiOperation(value = "角色下拉列表")
     @GetMapping("/options")
     public Result<List<Option>> listRoleOptions() {
-        List<Option> list = sysRoleService.listRoleOptions();
+        List<Option> list = roleService.listRoleOptions();
         return Result.success(list);
     }
 
@@ -46,21 +46,21 @@ public class SysRoleController {
     public Result getRoleDetail(
             @ApiParam("角色ID") @PathVariable Long roleId
     ) {
-        SysRole role = sysRoleService.getById(roleId);
+        SysRole role = roleService.getById(roleId);
         return Result.success(role);
     }
 
     @ApiOperation(value = "新增角色")
     @PostMapping
     public Result addRole(@Valid @RequestBody RoleForm roleForm) {
-        boolean result = sysRoleService.saveRole(roleForm);
+        boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);
     }
 
     @ApiOperation(value = "修改角色")
     @PutMapping(value = "/{id}")
     public Result updateRole(@Valid @RequestBody RoleForm roleForm) {
-        boolean result = sysRoleService.saveRole(roleForm);
+        boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);
     }
 
@@ -69,7 +69,7 @@ public class SysRoleController {
     public Result deleteRoles(
             @ApiParam("删除角色，多个以英文逗号(,)分割") @PathVariable String ids
     ) {
-        boolean result = sysRoleService.deleteRoles(ids);
+        boolean result = roleService.deleteRoles(ids);
         return Result.judge(result);
     }
 
@@ -77,28 +77,28 @@ public class SysRoleController {
     @PutMapping(value = "/{roleId}/status")
     public Result updateRoleStatus(
             @ApiParam("角色ID") @PathVariable Long roleId,
-            @ApiParam("角色状态:1-正常；0-禁用") @RequestParam Integer status
+            @ApiParam("角色状态:1-启用；0-禁用") @RequestParam Integer status
     ) {
-        boolean result = sysRoleService.updateRoleStatus(roleId, status);
+        boolean result = roleService.updateRoleStatus(roleId, status);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "获取角色的资源ID集合")
-    @GetMapping("/{roleId}/resourceIds")
-    public Result<RoleResourceForm> getRoleResources(
+    @ApiOperation(value = "获取角色的菜单ID集合")
+    @GetMapping("/{roleId}/menuIds")
+    public Result<List<Long>> getRoleMenuIds(
             @ApiParam("角色ID") @PathVariable Long roleId
     ) {
-        RoleResourceForm resourceIds = sysRoleService.getRoleResources(roleId);
+        List<Long> resourceIds = roleService.getRoleMenuIds(roleId);
         return Result.success(resourceIds);
     }
 
     @ApiOperation(value = "分配角色的资源权限")
-    @PutMapping("/{roleId}/resources")
-    public Result updateRoleResource(
+    @PutMapping("/{roleId}/menus")
+    public Result updateRoleMenus(
             @PathVariable Long roleId,
-            @RequestBody List<> roleResourceForm
+            @RequestBody List<Long> menuIds
     ) {
-        boolean result = sysRoleService.updateRoleResource(roleId,roleResourceForm);
+        boolean result = roleService.updateRoleMenus(roleId,menuIds);
         return Result.judge(result);
     }
 }
diff --git a/src/main/java/com/youlai/system/service/SysRoleService.java b/src/main/java/com/youlai/system/service/SysRoleService.java
index 8b271a83..a5c43f85 100644
--- a/src/main/java/com/youlai/system/service/SysRoleService.java
+++ b/src/main/java/com/youlai/system/service/SysRoleService.java
@@ -67,15 +67,15 @@ public interface SysRoleService extends IService<SysRole> {
      * @param roleId
      * @return
      */
-    RoleResourceForm getRoleResources(Long roleId);
+    List<Long> getRoleMenuIds(Long roleId);
 
 
     /**
      * 修改角色的资源权限
      *
      * @param roleId
-     * @param roleResourceForm
+     * @param menuIds
      * @return
      */
-    boolean updateRoleResource(Long roleId, RoleResourceForm roleResourceForm);
+    boolean updateRoleMenus(Long roleId, List<Long> menuIds);
 }
diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
index 2542cc16..77dea8a8 100644
--- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
@@ -164,30 +164,26 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
      * @return
      */
     @Override
-    public RoleResourceForm getRoleResources(Long roleId) {
-        RoleResourceForm roleResources = new RoleResourceForm();
-
+    public List<Long> getRoleMenuIds(Long roleId) {
         // 获取角色拥有的菜单ID集合
         List<Long> menuIds = sysRoleMenuService.listMenuIdsByRoleId(roleId);
-        roleResources.setMenuIds(menuIds);
-        return roleResources;
+        return menuIds;
     }
 
     /**
      * 修改角色的资源权限
      *
      * @param roleId
-     * @param roleResourceForm
+     * @param menuIds
      * @return
      */
     @Override
     @Transactional
     @CacheEvict(cacheNames = "system", key = "'routes'")
-    public boolean updateRoleResource(Long roleId, RoleResourceForm roleResourceForm) {
+    public boolean updateRoleMenus(Long roleId, List<Long> menuIds) {
         // 删除角色菜单
         sysRoleMenuService.remove(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
         // 新增角色菜单
-        List<Long> menuIds = roleResourceForm.getMenuIds();
         if (CollectionUtil.isNotEmpty(menuIds)) {
             List<SysRoleMenu> roleMenus = menuIds.stream()
                     .map(menuId -> new SysRoleMenu(roleId, menuId))