feature: 返回值添加classifyCode

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/vo/DataResourceTreeVo.java

@@ -33,6 +33,8 @@ public class DataResourceTreeVo {
             "字段二级分类：LEVEL_2_COLUMN_CLASSIFY" +
             "数据分级：DATA_CLASSIFY")
     private String dataType;
+    @ApiModelProperty(value = "分级分类code")
+    private String classifyCode;
     @ApiModelProperty(value = "子节点集合")
     private List<DataResourceTreeVo> child;
     @ApiModelProperty(value = "是否是树节点 true：是树节点,child不为空。false：非树节点,child为空。")

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java

@@ -143,6 +143,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .id(dataResourceEnum.getCode())
                 .label("全部")
                 .code(dataResourceEnum.getCode())
+                .classifyCode(dataResourceEnum.getCode())
                 .treeNode(true)
                 .build();
 
@@ -151,6 +152,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .code(item.getLevelCode())
                 .label(item.getLevelName())
                 .dataType(item.getTypeCode())
+                .classifyCode(dataResourceEnum.getCode())
                 .treeNode(false)
                 .pId(dataLevelTreeVo.getId())
                 .build()).collect(Collectors.toList());
@@ -208,7 +210,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             resourceVo.setTotal(0);
         } else {
             // 拼接表、列、pid
-            boolean b = combinePidAndTableInfo(topTreeVo, tabLabMap);
+            boolean b = combinePidAndTableInfo(topTreeVo, tabLabMap, dataResourceEnum);
             if (b) {
                 resourceVo.setNodes(new ArrayList<>());
                 resourceVo.setTotal(0);
@@ -332,7 +334,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             resourceVo.setNodes(new ArrayList<>());
             resourceVo.setTotal(0);
         } else {
-            boolean b = combinePidTabAndCol(topTreeVo, tableMap, colInfosMap);
+            boolean b = combinePidTabAndCol(topTreeVo, tableMap, colInfosMap, dataResourceEnum);
             if (b) {
                 resourceVo.setNodes(new ArrayList<>());
                 resourceVo.setTotal(0);
@@ -349,7 +351,7 @@ public class DataResourceFacade implements IDataResourceFacade {
         return colInfos.stream().collect(Collectors.groupingBy(AppDataItemInfo::getColumnClassify));
     }
 
-    private boolean combinePidTabAndCol(DataResourceTreeVo treeVo, Map<String, AppDataResourceInfo> tableMap, Map<String, List<AppDataItemInfo>> colInfosMap) {
+    private boolean combinePidTabAndCol(DataResourceTreeVo treeVo, Map<String, AppDataResourceInfo> tableMap, Map<String, List<AppDataItemInfo>> colInfosMap, DataResourceEnum resourceEnum) {
         List<DataResourceTreeVo> child = treeVo.getChild();
         Iterator<DataResourceTreeVo> iterator = child.iterator();
         while (iterator.hasNext()) {
@@ -359,7 +361,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             List<DataResourceTreeVo> cc = childVo.getChild();
             if (CollectionUtils.isNotEmpty(cc)) {
                 childVo.setTreeNode(true);
-                boolean emptyChild = combinePidTabAndCol(childVo, tableMap, colInfosMap);
+                boolean emptyChild = combinePidTabAndCol(childVo, tableMap, colInfosMap, resourceEnum);
                 if (emptyChild) {
                     iterator.remove();
                 }
@@ -375,7 +377,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                     List<DataResourceTreeVo> tableVos = tableGroup.entrySet().stream().map(e -> {
                         String tableId = e.getKey();
                         AppDataResourceInfo table = tableMap.get(tableId);
-                        return convertTableToTreeVo(childVo.getId(), Collections.singletonList(table), tableGroup);
+                        return convertTableToTreeVo(childVo.getId(), Collections.singletonList(table), tableGroup, resourceEnum);
                     }).flatMap(List::stream).collect(Collectors.toList());
                     childVo.setTreeNode(true);
                     childVo.setChild(tableVos);
@@ -783,9 +785,10 @@ public class DataResourceFacade implements IDataResourceFacade {
      *
      * @param treeVo
      * @param tabInfosMap
+     * @param dataResourceEnum
      * @return
      */
-    private boolean combinePidAndTableInfo(DataResourceTreeVo treeVo, Map<String, List<AppDataResourceInfo>> tabInfosMap) {
+    private boolean combinePidAndTableInfo(DataResourceTreeVo treeVo, Map<String, List<AppDataResourceInfo>> tabInfosMap, DataResourceEnum dataResourceEnum) {
         List<DataResourceTreeVo> child = treeVo.getChild();
         Iterator<DataResourceTreeVo> iterator = child.iterator();
         while (iterator.hasNext()) {
@@ -795,7 +798,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             List<DataResourceTreeVo> cc = childVo.getChild();
             if (CollectionUtils.isNotEmpty(cc)) {
                 childVo.setTreeNode(true);
-                boolean emptyChild = combinePidAndTableInfo(childVo, tabInfosMap);
+                boolean emptyChild = combinePidAndTableInfo(childVo, tabInfosMap, dataResourceEnum);
                 if (emptyChild) {
                     iterator.remove();
                 }
@@ -810,7 +813,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                     if (dataTabInfo == null) {
                         iterator.remove();
                     } else {
-                        List<DataResourceTreeVo> tableVos = convertTableToTreeVo(childVo.getId(), dataTabInfo, null);
+                        List<DataResourceTreeVo> tableVos = convertTableToTreeVo(childVo.getId(), dataTabInfo, null, dataResourceEnum);
                         childVo.setTreeNode(true);
                         childVo.setChild(tableVos);
                     }
@@ -821,17 +824,18 @@ public class DataResourceFacade implements IDataResourceFacade {
         return CollectionUtils.isEmpty(child);
     }
 
-    private List<DataResourceTreeVo> convertTableToTreeVo(String pid, List<AppDataResourceInfo> dataTabInfo, Map<String, List<AppDataItemInfo>> colInfosMap) {
+    private List<DataResourceTreeVo> convertTableToTreeVo(String pid, List<AppDataResourceInfo> dataTabInfo, Map<String, List<AppDataItemInfo>> colInfosMap, DataResourceEnum resourceEnum) {
         return dataTabInfo.stream().map(e -> {
             DataResourceTreeVo vo = new DataResourceTreeVo();
             vo.setId(e.getId());
             vo.setPId(pid);
             vo.setLabel(e.getTableName());
             vo.setDataType(AppDataTypeEnum.TAB.getValue());
+            vo.setClassifyCode(resourceEnum.getCode());
             if (null != colInfosMap) {
                 List<AppDataItemInfo> colInfoList = colInfosMap.get(e.getId());
                 if (CollectionUtils.isNotEmpty(colInfoList)) {
-                    List<DataResourceTreeVo> colVos = convertColumnToTreeVo(e.getId(), colInfoList);
+                    List<DataResourceTreeVo> colVos = convertColumnToTreeVo(e.getId(), colInfoList, resourceEnum);
                     vo.setChild(colVos);
                     vo.setTreeNode(true);
                 } else {
@@ -843,13 +847,14 @@ public class DataResourceFacade implements IDataResourceFacade {
         }).collect(Collectors.toList());
     }
 
-    private List<DataResourceTreeVo> convertColumnToTreeVo(String pid, List<AppDataItemInfo> colInfoList) {
+    private List<DataResourceTreeVo> convertColumnToTreeVo(String pid, List<AppDataItemInfo> colInfoList, DataResourceEnum resourceEnum) {
         return colInfoList.stream().map(e -> {
             DataResourceTreeVo vo = new DataResourceTreeVo();
             vo.setId(e.getId());
             vo.setPId(pid);
             vo.setLabel(e.getColumnName());
             vo.setDataType(AppDataTypeEnum.COL.getValue());
+            vo.setClassifyCode(resourceEnum.getCode());
             return vo;
         }).collect(Collectors.toList());
     }