فهرست منبع

按照前端要求的格式更改

shiqian 4 سال پیش
والد
کامیت
c3bc0f1299

+ 4 - 4
boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysMenu.java

@@ -1,7 +1,7 @@
 package com.boman.system.api.domain;
 
+import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.web.domain.BaseEntity;
-import com.sun.javafx.beans.IDProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -80,13 +80,13 @@ public class SysMenu extends BaseEntity
      * false 此表中有此菜单,但是未选择
      * 0 此表中无此菜单
      */
-    private List<Object> containsHead;
+    private List<JSONObject> containsHead;
 
-    public List<Object> getContainsHead() {
+    public List<JSONObject> getContainsHead() {
         return containsHead;
     }
 
-    public void setContainsHead(List<Object> containsHead) {
+    public void setContainsHead(List<JSONObject> containsHead) {
         this.containsHead = containsHead;
     }
 

+ 20 - 0
boman-api/boman-domain/src/main/java/com.boman.domain/RoleEnum.java

@@ -1,5 +1,7 @@
 package com.boman.domain;
 
+import com.alibaba.fastjson.JSONObject;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -96,4 +98,22 @@ public enum RoleEnum {
         }
         return result;
     }
+
+    /**
+     * 功能描述: 拿到所有的roles eg: A、M.....
+     *
+     * @return java.util.List<java.lang.String>
+     */
+    public static List<JSONObject> initData() {
+        List<String> roles = roles();
+        List<JSONObject> result = new ArrayList<>(roles.size());
+        for (String role : roles) {
+            JSONObject jsonObject = new JSONObject(2);
+            jsonObject.put("name", role);
+            jsonObject.put("type", "0");
+            result.add(jsonObject);
+        }
+
+        return result;
+    }
 }

+ 16 - 11
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -3,6 +3,7 @@ package com.boman.system.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
@@ -549,14 +550,15 @@ public class SysMenuServiceImpl implements ISysMenuService {
         }
 
         Map<String, Object> result = Maps.newHashMapWithExpectedSize(2);
-        result.put("heads", RoleEnum.all());
+        List<Map<String, String>> all = RoleEnum.all();
+        result.put("heads", all);
         if (isEmpty(tempList)) {
             result.put("sysMenus", tempList);
             return result;
         }
 
         for (SysMenu sysMenu : tempList) {
-            List<Object> containsHead = Lists.newArrayList("0", "0", "0", "0", "0", "0", "0", "0");
+            List<JSONObject> containsHead = RoleEnum.initData();
             List<SysMenu> childList = getChildList(menus, sysMenu);
             for (SysMenu childMenu : childList) {
                 String btn = RoleMenuDto.getBtnFromPerms(childMenu.getPerms());
@@ -576,31 +578,34 @@ public class SysMenuServiceImpl implements ISysMenuService {
         return result;
     }
 
-    private void switchBtn(List<Object> containsHead, String btn, Object value) {
+    private void switchBtn(List<JSONObject> containsHead, String btn, Object value) {
+        JSONObject jsonObject = new JSONObject(2);
+        jsonObject.put("name", btn);
+        jsonObject.put("type", value);
         switch (btn) {
             case GlobalBtn.A:
-                containsHead.set(0, value);
+                containsHead.set(0, jsonObject);
                 break;
             case GlobalBtn.M:
-                containsHead.set(1, value);
+                containsHead.set(1, jsonObject);
                 break;
             case GlobalBtn.D:
-                containsHead.set(2, value);
+                containsHead.set(2, jsonObject);
                 break;
             case GlobalBtn.Q:
-                containsHead.set(3, value);
+                containsHead.set(3, jsonObject);
                 break;
             case GlobalBtn.S:
-                containsHead.set(4, value);
+                containsHead.set(4, jsonObject);
                 break;
             case GlobalBtn.U:
-                containsHead.set(5, value);
+                containsHead.set(5, jsonObject);
                 break;
             case GlobalBtn.I:
-                containsHead.set(6, value);
+                containsHead.set(6, jsonObject);
                 break;
             case GlobalBtn.E:
-                containsHead.set(7, value);
+                containsHead.set(7, jsonObject);
                 break;
             default:
                 break;