[task-2001] 收集菜单资源以及按钮权限一览表 / 收集按钮权限一览表

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/ResourceRuleJob.java

@@ -52,12 +52,12 @@ public class ResourceRuleJob extends AbstractJob {
             }
         }
         sb.append(lineseparator + "---------------------菜单权限一览表---------------------------------" + lineseparator);
-        sb.append("" +"|"+partyRolePos.stream().map(x->x.getName()).collect(Collectors.joining("|")) + lineseparator );
+        sb.append("" +"^"+partyRolePos.stream().map(x->x.getName()).collect(Collectors.joining("^")) + lineseparator );
         for (MenuVO menu : allMenuList) {
-            String s1 = StringUtils.join(menu.roles, "|");
+            String s1 = StringUtils.join(menu.roles, "^");
             if(s1.contains("√")) {
                 String s = String.format("%s", StringUtils.trim(menu.parentCode + "/" + menu.menuCode));
-                sb.append(s + "|" + s1 + lineseparator );
+                sb.append(s + "^" + s1 + lineseparator );
             }
         }
         sb.append(lineseparator + "----------------按钮权限一览表--------------------------------------" + lineseparator );
@@ -67,7 +67,7 @@ public class ResourceRuleJob extends AbstractJob {
 
         List<String> roleList = partyRolePos.stream().map(x -> x.getName()).collect(Collectors.toList());
         roleList.add(0,"all");
-        sb.append("" +"|"+StringUtils.join(roleList, "|") + lineseparator );
+        sb.append("" +"^"+StringUtils.join(roleList, "^") + lineseparator );
         List<Map<String, Object>> list = fetchRecords("button_role_1");
         if (list != null) {
             for (Map<String, Object> map : list) {
@@ -90,7 +90,7 @@ public class ResourceRuleJob extends AbstractJob {
                 for (String role : roleList) {
                     ss.add(menu.buttons.containsKey(role)?StringUtils.join(menu.buttons.get(role), ","):"");
                 }
-                sb.append(StringUtils.join(ss, "|") + lineseparator );
+                sb.append(StringUtils.join(ss, "^") + lineseparator );
             }
         }
         logger.warn(sb.toString());
@@ -104,8 +104,8 @@ public class ResourceRuleJob extends AbstractJob {
         for (Object obj : jsonArray) {
             JSONObject jsonObject = (JSONObject) obj;
             JSONArray rights = JsonUtil.getJSONArray(jsonObject, "rights");
+            String label = jsonObject.getString("label");
             if (JsonUtil.isNotEmpty(rights)) {
-                String label = jsonObject.getString("label");
                 for (Object obj2 : rights) {
                     JSONObject jsonObject2 = (JSONObject) obj2;
                     String type = JsonUtil.getString(jsonObject2,"type","All");
@@ -120,7 +120,7 @@ public class ResourceRuleJob extends AbstractJob {
                                 map.put(r,l);
                             }
                         }
-                    }else if("all".equals(type)){
+                    }else if(!"none".equalsIgnoreCase(type)){
                         if(map.containsKey("all")){
                             map.get("all").add(label);
                         }else{
@@ -128,10 +128,16 @@ public class ResourceRuleJob extends AbstractJob {
                             l.add(label);
                             map.put("all",l);
                         }
-
-
                     }
                 }
+            }else{
+                if(map.containsKey("all")){
+                    map.get("all").add(label);
+                }else{
+                    List<String> l = new ArrayList<>();
+                    l.add(label);
+                    map.put("all",l);
+                }
             }
         }