|
@@ -184,7 +184,10 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
.attrType(dataResourceEnum.getAttrType().getValue()).label(dataResourceEnum.getLabel()).build();
|
|
.attrType(dataResourceEnum.getAttrType().getValue()).label(dataResourceEnum.getLabel()).build();
|
|
|
|
|
|
DataResourceTreeVo topTreeVo = DataResourceTreeVo.builder().id(dataResourceEnum.getCode()).label("全部")
|
|
DataResourceTreeVo topTreeVo = DataResourceTreeVo.builder().id(dataResourceEnum.getCode()).label("全部")
|
|
- .code(dataResourceEnum.getCode()).treeNode(true).build();
|
|
|
|
|
|
+ .code(dataResourceEnum.getCode())
|
|
|
|
+ .classifyCode(dataResourceEnum.getCode())
|
|
|
|
+ .treeNode(true)
|
|
|
|
+ .build();
|
|
List<DataCla> dataClaList = dataClaService.getAllDataCla();
|
|
List<DataCla> dataClaList = dataClaService.getAllDataCla();
|
|
Map<String, List<DataCla>> levelMap = dataClaList.stream().collect(Collectors.groupingBy(DataCla::getLevel));
|
|
Map<String, List<DataCla>> levelMap = dataClaList.stream().collect(Collectors.groupingBy(DataCla::getLevel));
|
|
//一级节点
|
|
//一级节点
|
|
@@ -291,6 +294,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
.pId(pid)
|
|
.pId(pid)
|
|
.label(item.getName())
|
|
.label(item.getName())
|
|
.code(item.getCode())
|
|
.code(item.getCode())
|
|
|
|
+ .classifyCode(DataResourceEnum.DATA_RESOURCE_CLASSIFY.getCode())
|
|
.build();
|
|
.build();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -319,7 +323,10 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
.attrType(dataResourceEnum.getAttrType().getValue()).label(dataResourceEnum.getLabel()).build();
|
|
.attrType(dataResourceEnum.getAttrType().getValue()).label(dataResourceEnum.getLabel()).build();
|
|
|
|
|
|
DataResourceTreeVo topTreeVo = DataResourceTreeVo.builder().id(dataResourceEnum.getCode()).label("全部")
|
|
DataResourceTreeVo topTreeVo = DataResourceTreeVo.builder().id(dataResourceEnum.getCode()).label("全部")
|
|
- .code(dataResourceEnum.getCode()).treeNode(true).build();
|
|
|
|
|
|
+ .code(dataResourceEnum.getCode())
|
|
|
|
+ .classifyCode(dataResourceEnum.getCode())
|
|
|
|
+ .treeNode(true)
|
|
|
|
+ .build();
|
|
List<FieldCla> fieldClaList = fieldClaService.getAllFieldCla();
|
|
List<FieldCla> fieldClaList = fieldClaService.getAllFieldCla();
|
|
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<>())
|
|
@@ -390,6 +397,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
.id(item.getId())
|
|
.id(item.getId())
|
|
.pId(pid)
|
|
.pId(pid)
|
|
.label(item.getName())
|
|
.label(item.getName())
|
|
|
|
+ .classifyCode(DataResourceEnum.COLUMN_CLASSIFY.getCode())
|
|
.code(item.getCode())
|
|
.code(item.getCode())
|
|
.build();
|
|
.build();
|
|
}
|
|
}
|
|
@@ -830,7 +838,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
if (null != colInfosMap) {
|
|
if (null != colInfosMap) {
|
|
List<AppDataItemInfo> colInfoList = colInfosMap.get(e.getId());
|
|
List<AppDataItemInfo> colInfoList = colInfosMap.get(e.getId());
|
|
if (CollectionUtils.isNotEmpty(colInfoList)) {
|
|
if (CollectionUtils.isNotEmpty(colInfoList)) {
|
|
- List<DataResourceTreeVo> colVos = convertColumnToTreeVo(e.getId(), colInfoList, resourceEnum);
|
|
|
|
|
|
+ List<DataResourceTreeVo> colVos = convertColumnToTreeVo(vo.getId(), colInfoList, resourceEnum);
|
|
vo.setChild(colVos);
|
|
vo.setChild(colVos);
|
|
vo.setTreeNode(true);
|
|
vo.setTreeNode(true);
|
|
} else {
|
|
} else {
|