|
@@ -189,7 +189,9 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
combineTreeNode(secNodes, thirdNodes);
|
|
combineTreeNode(secNodes, thirdNodes);
|
|
combineTreeNode(thirdNodes, fourNodes);
|
|
combineTreeNode(thirdNodes, fourNodes);
|
|
topTreeVo.setChild(firNodes);
|
|
topTreeVo.setChild(firNodes);
|
|
- getTotalCount(topTreeVo);
|
|
|
|
|
|
+
|
|
|
|
+ //计算总数量
|
|
|
|
+ resourceVo.setTotal(getTotalCount(topTreeVo));
|
|
resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
|
|
resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
|
|
return resourceVo;
|
|
return resourceVo;
|
|
}
|
|
}
|
|
@@ -217,11 +219,11 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
Map<String, List<FieldCla>> levelMap = fieldClaList.stream().collect(Collectors.groupingBy(FieldCla::getLevel));
|
|
Map<String, List<FieldCla>> levelMap = fieldClaList.stream().collect(Collectors.groupingBy(FieldCla::getLevel));
|
|
List<DataResourceTreeVo> firNodes = Optional.ofNullable(levelMap.get(FieldClaTypeEnum.FIR.getLevel())).orElse(new ArrayList<>())
|
|
List<DataResourceTreeVo> firNodes = Optional.ofNullable(levelMap.get(FieldClaTypeEnum.FIR.getLevel())).orElse(new ArrayList<>())
|
|
.stream().map(item -> convertFieldClaToNode(item, null)).collect(Collectors.toList());
|
|
.stream().map(item -> convertFieldClaToNode(item, null)).collect(Collectors.toList());
|
|
- List<DataResourceTreeVo> secNodes = Optional.ofNullable(levelMap.get(FieldClaTypeEnum.FIR.getLevel())).orElse(new ArrayList<>())
|
|
|
|
|
|
+ List<DataResourceTreeVo> secNodes = Optional.ofNullable(levelMap.get(FieldClaTypeEnum.SEC.getLevel())).orElse(new ArrayList<>())
|
|
.stream().map(item -> convertFieldClaToNode(item, item.getFirId())).collect(Collectors.toList());
|
|
.stream().map(item -> convertFieldClaToNode(item, item.getFirId())).collect(Collectors.toList());
|
|
combineTreeNode(firNodes, secNodes);
|
|
combineTreeNode(firNodes, secNodes);
|
|
topTreeVo.setChild(firNodes);
|
|
topTreeVo.setChild(firNodes);
|
|
- getTotalCount(topTreeVo);
|
|
|
|
|
|
+ resourceVo.setTotal(getTotalCount(topTreeVo));
|
|
resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
|
|
resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
|
|
return resourceVo;
|
|
return resourceVo;
|
|
}
|
|
}
|