|
|
@@ -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);
|
|
|
}
|
|
|
}
|