Przeglądaj źródła

tiny1类型, changed 1 to true, 0 to false

david 2 lat temu
rodzic
commit
b4b9525d35

+ 26 - 29
src/main/java/com/roma/romaapi/service/PageService.java

@@ -34,35 +34,26 @@ public class PageService {
             Map map = menuData.get(i);
             String menuType = (String) map.get("type");
             Map tempMap = new HashMap<>();
+            tempMap.put("id", map.get("id"));
+            tempMap.put("parent_id", map.get("parent_id"));
+            tempMap.put("label", (String) map.get("label"));
+            tempMap.put("icon", (String) map.get("icon"));
+            Object objectVisible = map.get("visible");
+            String stringVisible = objectVisible.toString();
+            boolean visible = stringVisible.equals("0") || stringVisible.equals("1");
+            tempMap.put("visible", visible);
             switch (menuType) {
                 case "menu": // 菜单
-                    tempMap.put("id", map.get("id"));
-                    tempMap.put("parent_id", map.get("parent_id"));
-                    tempMap.put("label", (String) map.get("label"));
-                    tempMap.put("icon", (String) map.get("icon"));
                     tempMap.put("url", (String) map.get("url"));
                     tempMap.put("schemaApi", (String) map.get("path"));
-                    tempMap.put("visible", 1);
-                    retList.add(tempMap);
                     break;
                 case "dir":
-                    tempMap.put("id", map.get("id"));
-                    tempMap.put("parent_id", map.get("parent_id"));
-                    tempMap.put("label", (String) map.get("label"));
-                    tempMap.put("icon", (String) map.get("icon"));
-                    tempMap.put("visible", 1);
-                    retList.add(tempMap);
                     break;
                 case "link":
-                    tempMap.put("id", map.get("id"));
-                    tempMap.put("parent_id", map.get("parent_id"));
-                    tempMap.put("label", (String) map.get("label"));
-                    tempMap.put("icon", (String) map.get("icon"));
                     tempMap.put("link", (String) map.get("path"));
-                    tempMap.put("visible", 1);
-                    retList.add(tempMap);
                     break;
             }
+            retList.add(tempMap);
         }
 
         return retList;
@@ -75,15 +66,18 @@ public class PageService {
         // 获取父节点
         for (Map<String, Object> tmp : renderMenu) {
             Object parentId =  tmp.get("parent_id");
-            String stringParentId = parentId.toString();
-            Integer intParentId = Integer.parseInt(stringParentId); // 上级id
+            String stringParentId = parentId.toString();// 上级id
             Object dataId = tmp.get("id");
-            String stringDataId = dataId.toString();
-            Integer intDataId = Integer.parseInt(stringDataId); // 主键id
-            System.out.println(stringParentId.equals("0"));
+            String stringDataId = dataId.toString();// 主键id
             if (stringParentId.equals("0")) {
                 // 组装子节点,开始循环去获取子节点
-                tmp.put("children", menuChild(stringDataId, renderMenu));
+                List<?> children = menuChild(stringDataId, renderMenu);
+                if(children == null || children.size() == 0) {
+                    tmp.put("leaf", true); // 如果不存在子元素
+                } else {
+                    tmp.put("children", children); // 存在子元素,则添加
+                }
+
                 pList.add(tmp);
             }
         }
@@ -101,14 +95,17 @@ public class PageService {
         List<Object> lists = new ArrayList<Object>();
         for (Map<String, Object> map : data) {
             Object parentId =  map.get("parent_id");
-            String stringParentId = parentId.toString();
-            Integer intParentId = Integer.parseInt(stringParentId); // 上级id
+            String stringParentId = parentId.toString(); // 上级id
             Object dataId = map.get("id");
-            String stringDataId = dataId.toString();
-            Integer intDataId = Integer.parseInt(stringDataId); // 主键id
+            String stringDataId = dataId.toString(); // 主键id
             if (stringParentId.equals(id)) {
                 // 组装子节点,开始循环去获取子节点
-                map.put("children", menuChild(stringDataId, data));
+                List<?> children = menuChild(stringDataId, data);
+                if(children == null || children.size() == 0) {
+                    map.put("leaf", true); // 如果不存在子元素
+                } else {
+                    map.put("children", children); // 存在子元素,则添加
+                }
                 lists.add(map);
             }
         }

+ 1 - 1
src/main/resources/application.properties

@@ -1 +1 @@
-#服务
server.port=8081

#数据库
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.26.143.101:3306/lowcode?serverTimezone=UTC
spring.datasource.username = root
spring.datasource.password = mypass

#redis
spring.redis.database=0
spring.redis.password=
#spring.redis.password=name:password
spring.redis.port=6379
spring.redis.host=172.26.143.101
spring.redis.timeout=5000
spring.redis.lettuce.pool.max-active=3
spring.redis.lettuce.pool.min-idle=2
spring.redis.lettuce.pool.max-idle=3
spring.redis.lettuce.pool.max-wait=-1
#spring.redis.lettuce.shutdown-timeout=100
#spring.cache.redis.cache-null-values=false


+#服务
server.port=8081

#数据库
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.26.143.101:3306/lowcode?serverTimezone=UTC&tinyInt1isBit=false&transformedBitIsBoolean=false
spring.datasource.username = root
spring.datasource.password = mypass

#redis
spring.redis.database=0
spring.redis.password=
#spring.redis.password=name:password
spring.redis.port=6379
spring.redis.host=172.26.143.101
spring.redis.timeout=5000
spring.redis.lettuce.pool.max-active=3
spring.redis.lettuce.pool.min-idle=2
spring.redis.lettuce.pool.max-idle=3
spring.redis.lettuce.pool.max-wait=-1
#spring.redis.lettuce.shutdown-timeout=100
#spring.cache.redis.cache-null-values=false