Commit eb9cb6ca authored by 廖旭伟's avatar 廖旭伟

菜单树增加节点类型

parent de319b54
...@@ -14,11 +14,13 @@ public class MenuNodeVO implements Serializable { ...@@ -14,11 +14,13 @@ public class MenuNodeVO implements Serializable {
private Long nodeId; private Long nodeId;
private Long parentId; private Long parentId;
private List<MenuNodeVO> childList; private List<MenuNodeVO> childList;
private Integer nodeType;
public MenuNodeVO(String nodeName, Long nodeId, Long parentId) { public MenuNodeVO(String nodeName, Long nodeId, Long parentId,Integer nodeType) {
this.nodeName = nodeName; this.nodeName = nodeName;
this.nodeId = nodeId; this.nodeId = nodeId;
this.parentId = parentId; this.parentId = parentId;
this.nodeType = nodeType;
} }
public void addChild(MenuNodeVO node){ public void addChild(MenuNodeVO node){
......
...@@ -270,7 +270,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity ...@@ -270,7 +270,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
List<MenuEntity> menuEntityList = this.find(query); List<MenuEntity> menuEntityList = this.find(query);
List<MenuNodeVO> nodeList = new ArrayList<>(); List<MenuNodeVO> nodeList = new ArrayList<>();
for (MenuEntity menuEntity:menuEntityList){ for (MenuEntity menuEntity:menuEntityList){
MenuNodeVO nodeVO = new MenuNodeVO(menuEntity.getName(),menuEntity.getId(),menuEntity.getParentId()); MenuNodeVO nodeVO = new MenuNodeVO(menuEntity.getName(),menuEntity.getId(),menuEntity.getParentId(),3);
nodeList.add(nodeVO); nodeList.add(nodeVO);
} }
List<MenuNodeVO> tree = creatMenuNodeTree(nodeList); List<MenuNodeVO> tree = creatMenuNodeTree(nodeList);
...@@ -303,7 +303,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity ...@@ -303,7 +303,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
List<ModelFeignVO> modelFeignVOS = JSONObject.parseArray(apiResp.getData().get("data").toString(),ModelFeignVO.class); List<ModelFeignVO> modelFeignVOS = JSONObject.parseArray(apiResp.getData().get("data").toString(),ModelFeignVO.class);
List<MenuNodeVO> nodeList = new ArrayList<>(); List<MenuNodeVO> nodeList = new ArrayList<>();
modelFeignVOS.stream().forEach(item->{ modelFeignVOS.stream().forEach(item->{
MenuNodeVO nodeVO = new MenuNodeVO(item.getModelName(),item.getId(),nodeId); MenuNodeVO nodeVO = new MenuNodeVO(item.getModelName(),item.getId(),nodeId,2);
nodeList.add(nodeVO); nodeList.add(nodeVO);
}); });
return nodeList; return nodeList;
...@@ -320,7 +320,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity ...@@ -320,7 +320,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
List<ModelCensusFeignVO> modelCensusFeignVOS = JSONObject.parseArray(apiResp.getData().get("data").toString(),ModelCensusFeignVO.class); List<ModelCensusFeignVO> modelCensusFeignVOS = JSONObject.parseArray(apiResp.getData().get("data").toString(),ModelCensusFeignVO.class);
List<MenuNodeVO> nodeList = new ArrayList<>(); List<MenuNodeVO> nodeList = new ArrayList<>();
modelCensusFeignVOS.stream().forEach(item->{ modelCensusFeignVOS.stream().forEach(item->{
MenuNodeVO nodeVO = new MenuNodeVO(item.getCensusName(),item.getId(),nodeId); MenuNodeVO nodeVO = new MenuNodeVO(item.getCensusName(),item.getId(),nodeId,1);
nodeList.add(nodeVO); nodeList.add(nodeVO);
}); });
return nodeList; return nodeList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment