【7.3.0】【role】整理获取角色详情的接口

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleServiceApi.java

@@ -25,10 +25,7 @@
 package cn.stylefeng.roses.kernel.system.api;
 
 import cn.stylefeng.roses.kernel.system.api.pojo.menu.MenuAndButtonTreeResponse;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO;
+import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.*;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuButtonDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleResourceDTO;
 import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest;
 
 import java.util.List;
@@ -169,4 +166,13 @@ public interface RoleServiceApi {
      */
     SysRoleDTO getRoleByCode(String roleCode);
 
+    /**
+     * 获取角色的菜单、按钮和资源信息
+     *
+     * @param roleIdList 角色id集合
+     * @author fengshuonan
+     * @date 2022/10/25 15:53
+     */
+    RoleAuthorizeInfo getRoleAuthorizeInfo(List<Long> roleIdList);
+
 }

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/dto/RoleAuthorizeInfo.java

@@ -0,0 +1,34 @@
+package cn.stylefeng.roses.kernel.system.api.pojo.role.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 角色拥有的菜单、按钮、资源信息的集合
+ *
+ * @author fengshuonan
+ * @date 2022/10/25 15:59
+ */
+@Data
+@AllArgsConstructor
+public class RoleAuthorizeInfo {
+
+    /**
+     * 角色拥有的菜单集合
+     */
+    private List<Long> menuIdList;
+
+    /**
+     * 角色拥有的按钮id集合
+     */
+    private List<Long> buttonIdList;
+
+    /**
+     * 角色拥有的资源编码集合
+     */
+    private Set<String> resourceCodeList;
+
+}

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java

@@ -50,10 +50,7 @@ import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.api.exception.enums.role.SysRoleExceptionEnum;
 import cn.stylefeng.roses.kernel.system.api.pojo.menu.MenuAndButtonTreeResponse;
 import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuButtonDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO;
+import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.*;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuButtonDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleMenuDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleResourceDTO;
 import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleMenuButtonRequest;
 import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest;
 import cn.stylefeng.roses.kernel.system.api.util.DataScopeUtil;
@@ -211,6 +208,60 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return roleResponse;
     }
 
+    @Override
+    public RoleAuthorizeInfo getRoleAuthorizeInfo(List<Long> roleIdList) {
+
+        HashSet<String> result = new HashSet<>();
+
+        for (Long roleId : roleIdList) {
+
+            // 从缓存获取所有角色绑定的资源
+            String key = String.valueOf(roleId);
+            List<String> resourceCodesCache = roleResourceCacheApi.get(key);
+            if (ObjectUtil.isNotEmpty(resourceCodesCache)) {
+                result.addAll(resourceCodesCache);
+                continue;
+            }
+
+            // 从数据库查询角色绑定的资源
+            LambdaQueryWrapper<SysRoleResource> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.select(SysRoleResource::getResourceCode);
+            queryWrapper.eq(SysRoleResource::getRoleId, roleId);
+            List<SysRoleResource> sysRoleResources = sysRoleResourceService.list(queryWrapper);
+            List<String> sysResourceCodes = sysRoleResources.parallelStream().map(SysRoleResource::getResourceCode).collect(Collectors.toList());
+            if (ObjectUtil.isNotEmpty(sysResourceCodes)) {
+                result.addAll(sysResourceCodes);
+                roleResourceCacheApi.put(key, sysResourceCodes);
+            }
+        }
+
+        // 获取角色的所有菜单
+        LambdaQueryWrapper<SysRoleMenu> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SysRoleMenu::getRoleId, roleIdList);
+        wrapper.select(SysRoleMenu::getMenuId);
+        List<SysRoleMenu> list = this.roleMenuService.list(wrapper);
+        List<Long> menuIds = list.stream().map(SysRoleMenu::getMenuId).collect(Collectors.toList());
+
+        // 获取角色绑定的所有按钮
+        LambdaQueryWrapper<SysRoleMenuButton> wrapper2 = new LambdaQueryWrapper<>();
+        wrapper2.in(SysRoleMenuButton::getRoleId, roleIdList);
+        wrapper2.select(SysRoleMenuButton::getButtonId);
+        List<SysRoleMenuButton> roleMenuButtons = this.sysRoleMenuButtonService.list(wrapper2);
+        List<Long> buttonIds = roleMenuButtons.stream().map(SysRoleMenuButton::getButtonId).collect(Collectors.toList());
+
+        // 获取菜单和按钮所有绑定的资源
+        ArrayList<Long> businessIds = new ArrayList<>();
+        businessIds.addAll(menuIds);
+        businessIds.addAll(buttonIds);
+
+        // 获取菜单和按钮
+        List<String> menuButtonResources = menuServiceApi.getResourceCodesByBusinessId(businessIds);
+        result.addAll(menuButtonResources);
+
+        // 封装返回结果
+        return new RoleAuthorizeInfo(menuIds, buttonIds, result);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void edit(SysRoleRequest sysRoleRequest) {
@@ -670,54 +721,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     public Set<String> getRoleResourceCodeList(List<Long> roleIdList) {
-
+        RoleAuthorizeInfo roleAuthorizeInfo = this.getRoleAuthorizeInfo(roleIdList);
-        HashSet<String> result = new HashSet<>();
+        return roleAuthorizeInfo.getResourceCodeList();
-
-        for (Long roleId : roleIdList) {
-
-            // 从缓存获取所有角色绑定的资源
-            String key = String.valueOf(roleId);
-            List<String> resourceCodesCache = roleResourceCacheApi.get(key);
-            if (ObjectUtil.isNotEmpty(resourceCodesCache)) {
-                result.addAll(resourceCodesCache);
-                continue;
-            }
-
-            // 从数据库查询角色绑定的资源
-            LambdaQueryWrapper<SysRoleResource> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.select(SysRoleResource::getResourceCode);
-            queryWrapper.eq(SysRoleResource::getRoleId, roleId);
-            List<SysRoleResource> sysRoleResources = sysRoleResourceService.list(queryWrapper);
-            List<String> sysResourceCodes = sysRoleResources.parallelStream().map(SysRoleResource::getResourceCode).collect(Collectors.toList());
-            if (ObjectUtil.isNotEmpty(sysResourceCodes)) {
-                result.addAll(sysResourceCodes);
-                roleResourceCacheApi.put(key, sysResourceCodes);
-            }
-        }
-
-        // 获取角色的所有菜单
-        LambdaQueryWrapper<SysRoleMenu> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SysRoleMenu::getRoleId, roleIdList);
-        wrapper.select(SysRoleMenu::getMenuId);
-        List<SysRoleMenu> list = this.roleMenuService.list(wrapper);
-        List<Long> menuIds = list.stream().map(SysRoleMenu::getMenuId).collect(Collectors.toList());
-
-        // 获取角色绑定的所有按钮
-        LambdaQueryWrapper<SysRoleMenuButton> wrapper2 = new LambdaQueryWrapper<>();
-        wrapper2.in(SysRoleMenuButton::getRoleId, roleIdList);
-        wrapper2.select(SysRoleMenuButton::getButtonId);
-        List<SysRoleMenuButton> roleMenuButtons = this.sysRoleMenuButtonService.list(wrapper2);
-        List<Long> buttonIds = roleMenuButtons.stream().map(SysRoleMenuButton::getButtonId).collect(Collectors.toList());
-
-        // 获取菜单和按钮所有绑定的资源
-        ArrayList<Long> businessIds = new ArrayList<>();
-        businessIds.addAll(menuIds);
-        businessIds.addAll(buttonIds);
-
-        // 获取菜单和按钮
-        List<String> menuButtonResources = menuServiceApi.getResourceCodesByBusinessId(businessIds);
-        result.addAll(menuButtonResources);
-        return result;
     }
 
     @Override