【8.3.1】优化角色绑定权限界面的勾选

kernel-s-system/system-business-permission/pom.xml

@@ -17,6 +17,13 @@
 
     <dependencies>
 
+        <!--ids解析工具-->
+        <dependency>
+            <groupId>com.javaguns.roses</groupId>
+            <artifactId>kernel-d-tree</artifactId>
+            <version>${roses.version}</version>
+        </dependency>
+
         <!--获取拖拽验证码图片-->
         <dependency>
             <groupId>com.javaguns.roses</groupId>

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuService.java

@@ -134,4 +134,14 @@ public interface SysMenuService extends IService<SysMenu>, SysMenuServiceApi {
      */
     Map<Long, Long> getMenuIdParentIdMap();
 
+    /**
+     * 将指定的菜单补全父级菜单
+     * <p>
+     * 一般用在参数是叶子节点的情况下，向上补全，为了方便展示菜单树
+     *
+     * @author fengshuonan
+     * @since 2024/10/30 20:57
+     */
+    List<SysMenu> completeParentMenu(List<SysMenu> menuList);
+
 }

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java

@@ -10,6 +10,7 @@ import cn.stylefeng.roses.kernel.event.sdk.publish.BusinessEventPublisher;
 import cn.stylefeng.roses.kernel.rule.constants.SymbolConstant;
 import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
+import cn.stylefeng.roses.kernel.rule.pidset.ParentIdParseUtil;
 import cn.stylefeng.roses.kernel.rule.tree.buildpids.PidStructureBuildUtil;
 import cn.stylefeng.roses.kernel.sys.api.callback.RemoveMenuCallbackApi;
 import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants;
@@ -159,7 +160,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     public List<SysMenu> getTotalMenus(Set<Long> limitMenuIds) {
         LambdaQueryWrapper<SysMenu> menuLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        menuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuName, SysMenu::getMenuParentId, SysMenu::getAppId,
+        menuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getMenuName, SysMenu::getMenuParentId, SysMenu::getAppId, SysMenu::getMenuPids,
                 SysMenu::getMenuSort);
 
         // 如果限制菜单不为空，则根据限制菜单id进行筛选，否则查询所有菜单
@@ -284,6 +285,51 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return sysMenuList.stream().collect(Collectors.toMap(SysMenu::getMenuId, SysMenu::getMenuParentId));
     }
 
+    @Override
+    public List<SysMenu> completeParentMenu(List<SysMenu> menuList) {
+        if (ObjectUtil.isEmpty(menuList)) {
+            return new ArrayList<>();
+        }
+
+        // 获取菜单的所有id，获取所有菜单的父级id集合
+        Set<Long> menuIds = menuList.stream().map(SysMenu::getMenuId).collect(Collectors.toSet());
+        Set<Long> needToAddMenuIdList = new HashSet<>();
+        for (SysMenu sysMenu : menuList) {
+            String menuPids = sysMenu.getMenuPids();
+            if (ObjectUtil.isEmpty(menuPids)) {
+                continue;
+            }
+            List<Long> parentIdList = ParentIdParseUtil.parseToPidList(menuPids);
+            if (ObjectUtil.isEmpty(parentIdList)) {
+                continue;
+            }
+            for (Long parentId : parentIdList) {
+                if (!parentId.equals(TreeConstants.DEFAULT_PARENT_ID)) {
+                    if (!menuIds.contains(parentId)) {
+                        needToAddMenuIdList.add(parentId);
+                    }
+                }
+            }
+        }
+
+        if (ObjectUtil.isEmpty(needToAddMenuIdList)) {
+            return menuList;
+        }
+
+        // 查找新家菜单的集合
+        List<SysMenu> newAddMenuList = this.listByIds(needToAddMenuIdList);
+
+        // 组合新增的和旧的菜单集合
+        ArrayList<SysMenu> sysMenus = new ArrayList<>();
+        sysMenus.addAll(menuList);
+        sysMenus.addAll(newAddMenuList);
+
+        // 对菜单进行再次排序，因为有的菜单是101，有的菜单是10101，需要将位数小的补0，再次排序
+        MenuOrderFixUtil.fixOrder(sysMenus);
+
+        return sysMenus;
+    }
+
     @Override
     public List<AppGroupDetail> getAppMenuGroupDetail(SysMenuRequest sysMenuRequest) {
 

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java

@@ -12,7 +12,6 @@ import cn.stylefeng.roses.kernel.sys.modular.role.pojo.response.RoleBindPermissi
 import cn.stylefeng.roses.kernel.sys.modular.role.pojo.response.RoleBindPermissionResponse;
 
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -33,25 +32,32 @@ public class PermissionAssignFactory {
      * @author fengshuonan
      * @since 2023/6/13 16:32
      */
-    public static List<RoleBindPermissionItem> createPermissionMenus(List<SysMenu> sysMenus) {
+    public static List<RoleBindPermissionItem> createPermissionMenus(List<SysMenu> limitScopeTotalMenusWithTree) {
 
-        if (ObjectUtil.isEmpty(sysMenus)) {
+        if (ObjectUtil.isEmpty(limitScopeTotalMenusWithTree)) {
             return new ArrayList<>();
         }
 
         // 搜集所有的父级菜单id
-        Set<Long> totalParentMenuId = sysMenus.stream().map(SysMenu::getMenuParentId).collect(Collectors.toSet());
+        Set<Long> totalParentMenuId = limitScopeTotalMenusWithTree.stream().map(SysMenu::getMenuParentId).collect(Collectors.toSet());
 
         // 通过父级菜单，筛选出来所有的叶子节点（如果菜单不存在父级菜单里，则代表是叶子节点）
-        Set<SysMenu> leafMenus = sysMenus.stream().filter(item -> !totalParentMenuId.contains(item.getMenuId()))
+        Set<Long> leafMenus = limitScopeTotalMenusWithTree.stream().map(SysMenu::getMenuId).filter(menuId -> !totalParentMenuId.contains(menuId)).collect(Collectors.toSet());
-                .collect(Collectors.toCollection(LinkedHashSet::new));
 
         // 叶子节点转化为RoleBindPermissionItem结构
         ArrayList<RoleBindPermissionItem> roleBindPermissionItems = new ArrayList<>();
+        for (SysMenu sysMenu : limitScopeTotalMenusWithTree) {
+
+            // 转化结构
+            RoleBindPermissionItem roleBindPermissionItem = new RoleBindPermissionItem(sysMenu.getMenuId(), sysMenu.getAppId(), sysMenu.getMenuName(), PermissionNodeTypeEnum.MENU.getCode(), false);
+
+            // 判断是否是叶子节点
+            if (leafMenus.contains(sysMenu.getMenuId())) {
+                roleBindPermissionItem.setLeafFlag(true);
+            } else {
+                roleBindPermissionItem.setLeafFlag(false);
+            }
 
-        for (SysMenu leafMenu : leafMenus) {
-            RoleBindPermissionItem roleBindPermissionItem = new RoleBindPermissionItem(leafMenu.getMenuId(),
-                    leafMenu.getAppId(), leafMenu.getMenuName(), PermissionNodeTypeEnum.MENU.getCode(), false);
             roleBindPermissionItems.add(roleBindPermissionItem);
         }
 
@@ -74,8 +80,8 @@ public class PermissionAssignFactory {
 
         // 封装响应结果
         for (SysApp sysApp : sysApps) {
-            RoleBindPermissionItem roleBindPermissionItem = new RoleBindPermissionItem(sysApp.getAppId(),
+            RoleBindPermissionItem roleBindPermissionItem = new RoleBindPermissionItem(sysApp.getAppId(), TreeConstants.DEFAULT_PARENT_ID, sysApp.getAppName(), PermissionNodeTypeEnum.APP.getCode(),
-                    TreeConstants.DEFAULT_PARENT_ID, sysApp.getAppName(), PermissionNodeTypeEnum.APP.getCode(), false);
+                    false);
             appResults.add(roleBindPermissionItem);
         }
 
@@ -98,8 +104,7 @@ public class PermissionAssignFactory {
 
         // 封装响应结果
         for (SysMenuOptions sysMenuOptions : sysMenuOptionsList) {
-            RoleBindPermissionItem roleBindPermissionItem = new RoleBindPermissionItem(sysMenuOptions.getMenuOptionId(),
+            RoleBindPermissionItem roleBindPermissionItem = new RoleBindPermissionItem(sysMenuOptions.getMenuOptionId(), sysMenuOptions.getMenuId(), sysMenuOptions.getOptionName(),
-                    sysMenuOptions.getMenuId(), sysMenuOptions.getOptionName(),
                     PermissionNodeTypeEnum.OPTIONS.getCode(), false);
             optionsResult.add(roleBindPermissionItem);
         }
@@ -116,20 +121,30 @@ public class PermissionAssignFactory {
      * @author fengshuonan
      * @since 2023/6/13 17:43
      */
-    public static RoleBindPermissionResponse composeSelectStructure(List<RoleBindPermissionItem> apps,
+    public static RoleBindPermissionResponse composeSelectStructure(List<RoleBindPermissionItem> apps, List<RoleBindPermissionItem> menus, List<RoleBindPermissionItem> options) {
-                                                                    List<RoleBindPermissionItem> menus,
-                                                                    List<RoleBindPermissionItem> options) {
 
         // 定义全选属性
         RoleBindPermissionResponse roleBindPermissionResponse = new RoleBindPermissionResponse();
         roleBindPermissionResponse.setChecked(false);
 
+        // 【2024年10月30日】把菜单上的功能挂载到菜单上
+        for (RoleBindPermissionItem menuItem : menus) {
+            for (RoleBindPermissionItem optionItem : options) {
+                if (Convert.toLong(optionItem.getNodeParentId()).equals(Convert.toLong(menuItem.getNodeId()))) {
+                    List<RoleBindPermissionItem> functionList = menuItem.getFunctionList();
+                    if (ObjectUtil.isEmpty(functionList)) {
+                        functionList = new ArrayList<>();
+                    }
+                    functionList.add(optionItem);
+                    menuItem.setFunctionList(functionList);
+                }
+            }
+        }
+
         // 合并应用菜单和功能，并构建树形结构
         apps.addAll(menus);
-        apps.addAll(options);
 
-        List<RoleBindPermissionItem> roleBindPermissionItems = new DefaultTreeBuildFactory<RoleBindPermissionItem>().doTreeBuild(
+        List<RoleBindPermissionItem> roleBindPermissionItems = new DefaultTreeBuildFactory<RoleBindPermissionItem>().doTreeBuild(apps);
-                apps);
         roleBindPermissionResponse.setAppPermissionList(roleBindPermissionItems);
 
         return roleBindPermissionResponse;
@@ -143,8 +158,7 @@ public class PermissionAssignFactory {
      * @author fengshuonan
      * @since 2023/6/13 19:00
      */
-    public static RoleBindPermissionResponse fillCheckedFlag(RoleBindPermissionResponse roleBindPermissionResponse,
+    public static RoleBindPermissionResponse fillCheckedFlag(RoleBindPermissionResponse roleBindPermissionResponse, Set<Long> rolePermissions) {
-                                                             Set<Long> rolePermissions) {
 
         List<RoleBindPermissionItem> appList = roleBindPermissionResponse.getAppPermissionList();
 

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/response/RoleBindPermissionItem.java

@@ -60,9 +60,11 @@ public class RoleBindPermissionItem implements AbstractTreeNode<RoleBindPermissi
     private String nodeName;
 
     /**
-     * 节点类型：1-应用，2-菜单，3-功能，-1-所有权限
+     * 节点类型：1-应用，2-菜单，-1-所有权限
+     * <p>
+     * 【2024年10月30日修改】去掉了3-功能，功能现在单独放在functionList这个字段
      */
-    @ChineseDescription("节点类型：1-应用，2-菜单，3-功能，-1-所有权限")
+    @ChineseDescription("节点类型：1-应用，2-菜单，-1-所有权限")
     private Integer permissionNodeType;
 
     /**
@@ -77,6 +79,18 @@ public class RoleBindPermissionItem implements AbstractTreeNode<RoleBindPermissi
     @ChineseDescription("子节点集合")
     private List<RoleBindPermissionItem> children;
 
+    /**
+     * 是否是叶子节点
+     */
+    @ChineseDescription("是否是叶子节点")
+    private Boolean leafFlag;
+
+    /**
+     * 功能集合
+     */
+    @ChineseDescription("功能集合")
+    private List<RoleBindPermissionItem> functionList;
+
     public RoleBindPermissionItem() {
 
     }

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

@@ -119,18 +119,21 @@ public class PermissionAssignServiceImpl implements PermissionAssignService {
     public RoleBindPermissionResponse createSelectTreeStructure(Set<Long> limitMenuIdsAndOptionIds) {
 
         // 获取指定所有的菜单，如果不限制范围，则直接查询所有的菜单
-        List<SysMenu> totalMenus = null;
+        List<SysMenu> limitScopeTotalMenus = null;
         if (ObjectUtil.isEmpty(limitMenuIdsAndOptionIds)) {
-            totalMenus = this.sysMenuService.getTotalMenus();
+            limitScopeTotalMenus = this.sysMenuService.getTotalMenus();
         } else {
-            totalMenus = this.sysMenuService.getTotalMenus(limitMenuIdsAndOptionIds);
+            limitScopeTotalMenus = this.sysMenuService.getTotalMenus(limitMenuIdsAndOptionIds);
         }
 
+        // 【2024年10月30日新增】将这些菜单，补全父级节点，因为角色权限分配这块，单纯渲染叶子节点不方便
+        List<SysMenu> limitScopeTotalMenusWithTree = this.sysMenuService.completeParentMenu(limitScopeTotalMenus);
+
         // 组装所有的叶子节点菜单【初始化菜单】
-        List<RoleBindPermissionItem> totalResultMenus = PermissionAssignFactory.createPermissionMenus(totalMenus);
+        List<RoleBindPermissionItem> totalResultMenus = PermissionAssignFactory.createPermissionMenus(limitScopeTotalMenusWithTree);
 
         // 查询菜单对应的所有应用
-        Set<Long> appIdList = totalMenus.stream().map(SysMenu::getAppId).collect(Collectors.toSet());
+        Set<Long> appIdList = limitScopeTotalMenusWithTree.stream().map(SysMenu::getAppId).collect(Collectors.toSet());
         LambdaQueryWrapper<SysApp> sysAppLambdaQueryWrapper = new LambdaQueryWrapper<>();
         sysAppLambdaQueryWrapper.in(SysApp::getAppId, appIdList);
         sysAppLambdaQueryWrapper.select(SysApp::getAppId, SysApp::getAppName);