Merge branch 'mzq-sjjq-220929' into 'develop'

Mzq sjjq 220929

See merge request xj-aks/dcuc/app-service!6

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/AppDataItemInfo.java

@@ -27,7 +27,7 @@ public class AppDataItemInfo {
     @TableId(type = IdType.UUID)
     private String id;
     /**
-     * 数据资源ID
+     * AppDataResourceInfo表主键
      */
     private String resourceTableId;
     /**

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/enumresources/DataResourceEnum.java

@@ -14,7 +14,7 @@ public enum DataResourceEnum {
     /**
      * 数据分级
      */
-    DATA_CLASSIFY("DATA_CLASSIFY", "数据分级", "DATA_CLASSIFY", DataAttrTypeEnum.DATA_ATTR_TABLE),
+    DATA_LEVEL("DATA_LEVEL", "数据分级", "DATA_LEVEL", DataAttrTypeEnum.DATA_ATTR_TABLE),
 
     /**
      * 数据资源分类
@@ -24,7 +24,7 @@ public enum DataResourceEnum {
     /**
      * 数据安全级别
      */
-    DATA_SECURITY_LEVEL("DATA_SECURITY_LEVEL", "数据安全级别", "DATA_SECURITY_LEVEL", DataAttrTypeEnum.DATA_ATTR_COLUMN),
+    COLUMN_SECURITY_LEVEL("COLUMN_SECURITY_LEVEL", "数据安全级别", "COLUMN_SECURITY_LEVEL", DataAttrTypeEnum.DATA_ATTR_COLUMN),
 
     /**
      * 字段分类

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

@@ -0,0 +1,41 @@
+package com.dragoninfo.dcuc.app.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author mazq
+ * @date 2021/4/13
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "数据资源同步树对象")
+public class DataResourceSyncTreeVo {
+
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "数据资源code")
+    private String code;
+    @ApiModelProperty(value = "节点名称")
+    private String label;
+    @ApiModelProperty(value = "数据资源类型" +
+            "数据安全级别：DATA_SECURITY_LEVEL " +
+            "字段一级分类：LEVEL_1_COLUMN_CLASSIFY" +
+            "字段二级分类：LEVEL_2_COLUMN_CLASSIFY" +
+            "数据分级：DATA_CLASSIFY")
+    private String dataType;
+    @ApiModelProperty(value = "子节点集合")
+    private List<DataResourceSyncTreeVo> child;
+    @ApiModelProperty(value = "是否是树节点 true：是树节点,child不为空。false：非树节点,child为空。")
+    private Boolean treeNode;
+    @ApiModelProperty(value = "父节点id")
+    private String pId;
+}

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

@@ -27,12 +27,8 @@ public class DataResourceTreeVo {
     private String code;
     @ApiModelProperty(value = "节点名称")
     private String label;
-    @ApiModelProperty(value = "数据资源类型" +
-            "数据安全级别：DATA_SECURITY_LEVEL " +
-            "字段一级分类：LEVEL_1_COLUMN_CLASSIFY" +
-            "字段二级分类：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

@@ -82,6 +82,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             List<AppDataItemInfo> colInfos = colInfoService.getHasClassifyColInfos();
             result.add(getSecurityLevelTree());
             result.add(getFieldClassifyTree(tabInfos, colInfos));
+            result.add(getColumnRelTree());
         } else {
             List<AppDataResourceInfo> tabInfos = tabInfoService.getAllTabInfos();
             List<AppDataItemInfo> colInfos = colInfoService.getHasClassifyColInfos();
@@ -89,6 +90,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             result.add(getDataClassifyTree(tabInfos));
             result.add(getSecurityLevelTree());
             result.add(getFieldClassifyTree(tabInfos, colInfos));
+            result.add(getColumnRelTree());
         }
         return result;
     }
@@ -100,7 +102,7 @@ public class DataResourceFacade implements IDataResourceFacade {
         List<AppDataItemInfo> colInfos = null;
         List<AppDataResourceInfo> tabInfos = null;
         switch (dataResourceEnum) {
-            case DATA_CLASSIFY:
+            case DATA_LEVEL:
                 result = getDataLevelTree();
                 break;
             case COLUMN_CLASSIFY:
@@ -108,13 +110,16 @@ public class DataResourceFacade implements IDataResourceFacade {
                 colInfos = colInfoService.getHasClassifyColInfos();
                 result = getFieldClassifyTree(tabInfos, colInfos);
                 break;
-            case DATA_SECURITY_LEVEL:
+            case COLUMN_SECURITY_LEVEL:
                 result = getSecurityLevelTree();
                 break;
             case DATA_RESOURCE_CLASSIFY:
                 tabInfos = tabInfoService.getHasClassifyTables();
                 result = getDataClassifyTree(tabInfos);
                 break;
+            case COLUMN_RELATION_CATALOG:
+                result = getColumnRelTree();
+                break;
             default:
                 break;
         }
@@ -122,7 +127,12 @@ public class DataResourceFacade implements IDataResourceFacade {
     }
 
     private DataResourceClassifyVo getDataLevelTree() {
-        DataResourceEnum dataResourceEnum = DataResourceEnum.DATA_CLASSIFY;
+        DataResourceEnum dataResourceEnum = DataResourceEnum.DATA_LEVEL;
+        List<DataLevelVo> dataLevelList = getDataLevelList();
+        return getOneLevelTree(dataResourceEnum, dataLevelList);
+    }
+
+    private DataResourceClassifyVo getOneLevelTree(DataResourceEnum dataResourceEnum, List<DataLevelVo> dataLevelList) {
         DataResourceClassifyVo dataResourceClassifyVo = DataResourceClassifyVo.builder()
                 .id(dataResourceEnum.getCode())
                 .attrType(dataResourceEnum.getAttrType().getValue())
@@ -133,14 +143,15 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .id(dataResourceEnum.getCode())
                 .label("全部")
                 .code(dataResourceEnum.getCode())
+                .classifyCode(dataResourceEnum.getCode())
                 .treeNode(true)
                 .build();
-        List<DataLevelVo> dataLevelList = getDataLevelList();
+
         List<DataResourceTreeVo> child = dataLevelList.stream().map(item -> DataResourceTreeVo.builder()
                 .id(item.getId())
                 .code(item.getLevelCode())
                 .label(item.getLevelName())
-                .dataType(item.getTypeCode())
+                .classifyCode(dataResourceEnum.getCode())
                 .treeNode(false)
                 .pId(dataLevelTreeVo.getId())
                 .build()).collect(Collectors.toList());
@@ -158,42 +169,9 @@ public class DataResourceFacade implements IDataResourceFacade {
     }
 
     private DataResourceClassifyVo getSecurityLevelTree() {
-        DataResourceEnum dataResourceEnum = DataResourceEnum.DATA_SECURITY_LEVEL;
-
-        DataResourceClassifyVo dataResourceClassifyVo = DataResourceClassifyVo.builder()
-                .id(dataResourceEnum.getCode())
-                .attrType(dataResourceEnum.getAttrType().getValue())
-                .label(dataResourceEnum.getLabel())
-                .build();
-
-        DataResourceTreeVo securityLevelTree = DataResourceTreeVo.builder()
-                .id(dataResourceEnum.getCode())
-                .label("全部")
-                .code(dataResourceEnum.getCode())
-                .treeNode(true)
-                .build();
+        DataResourceEnum dataResourceEnum = DataResourceEnum.COLUMN_SECURITY_LEVEL;
         List<DataLevelVo> securityLevelList = getSecurityLevelList();
-
-        List<DataResourceTreeVo> child = securityLevelList.stream().map(item -> DataResourceTreeVo.builder()
-                .id(item.getId())
-                .code(item.getLevelCode())
-                .label(item.getLevelName())
-                .dataType(item.getTypeCode())
-                .treeNode(false)
-                .pId(securityLevelTree.getId())
-                .build()).collect(Collectors.toList());
-        securityLevelTree.setChild(child);
-        if (child.size() == 0) {
-            dataResourceClassifyVo.setNodes(new ArrayList<>());
-            dataResourceClassifyVo.setTotal(0);
-        } else {
-            dataResourceClassifyVo.setNodes(new ArrayList<DataResourceTreeVo>() {{
-                add(securityLevelTree);
-            }});
-            //设置总数量
-            dataResourceClassifyVo.setTotal(child.size());
-        }
-        return dataResourceClassifyVo;
+        return getOneLevelTree(dataResourceEnum, securityLevelList);
     }
 
     private DataResourceClassifyVo getDataClassifyTree(List<AppDataResourceInfo> tabInfos) {
@@ -231,7 +209,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);
@@ -311,17 +289,28 @@ public class DataResourceFacade implements IDataResourceFacade {
         return DataResourceTreeVo.builder()
                 .id(item.getId())
                 .pId(pid)
-                .dataType(item.getDataType())
                 .label(item.getName())
                 .code(item.getCode())
                 .build();
     }
 
+    private DataResourceClassifyVo getColumnRelTree() {
+        DataResourceEnum dataResourceEnum = DataResourceEnum.COLUMN_RELATION_CATALOG;
+        List<DataLevelVo> columnRelationList = getColumnRelationList();
+        return getOneLevelTree(dataResourceEnum, columnRelationList);
+    }
+
+    private List<DataLevelVo> getColumnRelationList() {
+        List<AppColumnRelation> all = appColumnRelationService.findAll();
+        return all.stream()
+                .map(item -> new DataLevelVo(item.getId(), item.getCodeValue(), item.getCodeName(), DataResourceEnum.COLUMN_RELATION_CATALOG.getDataType()))
+                .collect(Collectors.toList());
+    }
 
     private DataResourceClassifyVo getFieldClassifyTree(List<AppDataResourceInfo> tabInfos, List<AppDataItemInfo> colInfos) {
         Map<String, AppDataResourceInfo> tableMap = tabInfos
                 .stream()
-                .collect(Collectors.toMap(AppDataResourceInfo::getDataObjectId, e -> e));
+                .collect(Collectors.toMap(AppDataResourceInfo::getId, e -> e));
         Map<String, List<AppDataItemInfo>> colInfosMap = getColumnClaGroupMap(colInfos);
 
         DataResourceEnum dataResourceEnum = DataResourceEnum.COLUMN_CLASSIFY;
@@ -343,7 +332,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);
@@ -360,7 +349,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()) {
@@ -370,7 +359,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();
                 }
@@ -386,7 +375,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);
@@ -400,7 +389,6 @@ public class DataResourceFacade implements IDataResourceFacade {
         return DataResourceTreeVo.builder()
                 .id(item.getId())
                 .pId(pid)
-                .dataType(item.getDataType())
                 .label(item.getName())
                 .code(item.getCode())
                 .build();
@@ -546,7 +534,7 @@ public class DataResourceFacade implements IDataResourceFacade {
         Runnable r = () -> {
             try {
                 RequestContextHolder.setRequestAttributes(requestAttributes);
-                List<DataResourceTreeVo> nodes = getDataClassifyTreeFromRemote();
+                List<DataResourceSyncTreeVo> nodes = getDataClassifyTreeFromRemote();
                 dataClaService.sync(nodes, null);
             } finally {
                 RequestContextHolder.resetRequestAttributes();
@@ -571,7 +559,7 @@ public class DataResourceFacade implements IDataResourceFacade {
         Runnable r = () -> {
             try {
                 RequestContextHolder.setRequestAttributes(requestAttributes);
-                List<DataResourceTreeVo> nodes = getFieldClassifyTreeFromRemote();
+                List<DataResourceSyncTreeVo> nodes = getFieldClassifyTreeFromRemote();
                 fieldClaService.sync(nodes, null);
             } finally {
                 RequestContextHolder.resetRequestAttributes();
@@ -613,7 +601,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 return vo;
             }).collect(Collectors.toList());
 
-        } else if (DataResourceEnum.DATA_CLASSIFY.equals(anEnum)) {
+        } else if (DataResourceEnum.DATA_LEVEL.equals(anEnum)) {
             List<DataLevel> list = dataLevelService.getByIds(ids);
             list.stream().map(item -> {
                 DataLevelVo vo = new DataLevelVo();
@@ -635,7 +623,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 return vo;
             }).collect(Collectors.toList());
 
-        } else if (DataResourceEnum.DATA_SECURITY_LEVEL.equals(anEnum)) {
+        } else if (DataResourceEnum.COLUMN_SECURITY_LEVEL.equals(anEnum)) {
             List<FieldSec> list = dataSecService.getByIds(ids);
             list.stream().map(item -> {
                 DataLevelVo vo = new DataLevelVo();
@@ -664,7 +652,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             vo.setLevelCode(fieldCla.getCode());
             vo.setLevelName(fieldCla.getName());
             vo.setTypeCode(fieldCla.getDataType());
-        } else if (DataResourceEnum.DATA_CLASSIFY.equals(anEnum)) {
+        } else if (DataResourceEnum.DATA_LEVEL.equals(anEnum)) {
             DataLevel dataLevel = dataLevelService.getById(id);
             vo.setId(dataLevel.getId());
             vo.setLevelCode(dataLevel.getLevelCode());
@@ -676,7 +664,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             vo.setLevelCode(dataCla.getId());
             vo.setLevelName(dataCla.getName());
             vo.setTypeCode(dataCla.getCode());
-        } else if (DataResourceEnum.DATA_SECURITY_LEVEL.equals(anEnum)) {
+        } else if (DataResourceEnum.COLUMN_SECURITY_LEVEL.equals(anEnum)) {
             FieldSec dataSec = dataSecService.getById(id);
             vo.setId(dataSec.getId());
             vo.setLevelCode(dataSec.getSecCode());
@@ -692,12 +680,12 @@ public class DataResourceFacade implements IDataResourceFacade {
      *
      * @return
      */
-    private List<DataResourceTreeVo> getDataClassifyTreeFromRemote() {
+    private List<DataResourceSyncTreeVo> getDataClassifyTreeFromRemote() {
         String id = DataResourceEnum.DATA_RESOURCE_CLASSIFY.getCode();
-        List<DataResourceTreeVo> collect = getFirstChildResourceClassifies(dataResourceService.getDataClassifyList())
+        List<DataResourceSyncTreeVo> collect = getFirstChildResourceClassifies(dataResourceService.getDataClassifyList())
                 .stream()
                 .map(firstClassify -> {
-                    DataResourceTreeVo firstTreeVo = DataResourceTreeVo.builder()
+                    DataResourceSyncTreeVo firstTreeVo = DataResourceSyncTreeVo.builder()
                             .id(Joiner.on(CommonCons.ID_SEPARATOR).join(id, firstClassify.getCodeValue()))
                             .code(firstClassify.getCodeValue())
                             .label(firstClassify.getCodeName())
@@ -708,7 +696,7 @@ public class DataResourceFacade implements IDataResourceFacade {
 
                     firstTreeVo.setChild(getFirstChildResourceClassifies(firstClassify.getChildrenType()).stream()
                             .map(secondClassify -> {
-                                DataResourceTreeVo secondTreeVo = DataResourceTreeVo.builder()
+                                DataResourceSyncTreeVo secondTreeVo = DataResourceSyncTreeVo.builder()
                                         .id(Joiner.on(CommonCons.ID_SEPARATOR).join(firstTreeVo.getId(), secondClassify.getCodeValue()))
                                         .code(secondClassify.getCodeValue())
                                         .label(secondClassify.getCodeName())
@@ -719,7 +707,7 @@ public class DataResourceFacade implements IDataResourceFacade {
 
                                 secondTreeVo.setChild(getChildrenTypeList(secondClassify.getChildrenType()).stream()
                                         .map(thirdClassify -> {
-                                            DataResourceTreeVo thirdTreeVo = DataResourceTreeVo.builder()
+                                            DataResourceSyncTreeVo thirdTreeVo = DataResourceSyncTreeVo.builder()
                                                     .id(Joiner.on(CommonCons.ID_SEPARATOR).join(secondTreeVo.getId(), thirdClassify.getTypeCode()))
                                                     .code(thirdClassify.getTypeCode())
                                                     .label(thirdClassify.getTypeName())
@@ -730,7 +718,7 @@ public class DataResourceFacade implements IDataResourceFacade {
 
                                             thirdTreeVo.setChild(thirdClassify.getDataList().stream()
                                                     .map(fourClassify -> {
-                                                        DataResourceTreeVo fourTreeVo = DataResourceTreeVo.builder()
+                                                        DataResourceSyncTreeVo fourTreeVo = DataResourceSyncTreeVo.builder()
                                                                 .id(Joiner.on(CommonCons.ID_SEPARATOR).join(thirdTreeVo.getId(), fourClassify.getCodeValue()))
                                                                 .code(fourClassify.getCodeValue())
                                                                 .label(fourClassify.getCodeName())
@@ -754,12 +742,12 @@ public class DataResourceFacade implements IDataResourceFacade {
      *
      * @return
      */
-    private List<DataResourceTreeVo> getFieldClassifyTreeFromRemote() {
+    private List<DataResourceSyncTreeVo> getFieldClassifyTreeFromRemote() {
         String id = DataResourceEnum.COLUMN_CLASSIFY.getCode();
-        List<DataResourceTreeVo> collect = getFirstChildResourceClassifies(dataResourceService.getFieldClassifyList())
+        List<DataResourceSyncTreeVo> collect = getFirstChildResourceClassifies(dataResourceService.getFieldClassifyList())
                 .stream()
                 .map(firstClassify -> {
-                    DataResourceTreeVo firstTreeVo = DataResourceTreeVo.builder()
+                    DataResourceSyncTreeVo firstTreeVo = DataResourceSyncTreeVo.builder()
                             .id(Joiner.on(CommonCons.ID_SEPARATOR).join(id, firstClassify.getCodeValue()))
                             .code(firstClassify.getCodeValue())
                             .label(firstClassify.getCodeName())
@@ -771,7 +759,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                     firstTreeVo.setChild(getFirstChildResourceClassifies(firstClassify.getChildrenType())
                             .stream()
                             .map(secondClassify -> {
-                                        DataResourceTreeVo secondTreeVo = DataResourceTreeVo.builder()
+                                DataResourceSyncTreeVo secondTreeVo = DataResourceSyncTreeVo.builder()
                                                 .id(Joiner.on(CommonCons.ID_SEPARATOR).join(firstTreeVo.getId(), secondClassify.getCodeValue()))
                                                 .code(secondClassify.getCodeValue())
                                                 .label(secondClassify.getCodeName())
@@ -794,9 +782,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()) {
@@ -806,7 +795,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();
                 }
@@ -821,7 +810,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);
                     }
@@ -832,17 +821,17 @@ 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.getDataObjectId());
+                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 {
@@ -854,13 +843,13 @@ 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());
     }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/IAppColumnRelationService.java

@@ -1,5 +1,6 @@
 package com.dragoninfo.dcuc.app.service.sub;
 
+import com.dragoninfo.dcuc.app.entity.sub.AppColumnRelation;
 import com.dragoninfo.dcuc.app.vo.AppColumnRelationVO;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
 
@@ -20,4 +21,6 @@ public interface IAppColumnRelationService {
      * @param list 列表
      */
     void sync(List<AppColumnRelationVO> list);
+
+    List<AppColumnRelation> findAll();
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/IDataClaService.java

@@ -3,7 +3,7 @@ package com.dragoninfo.dcuc.app.service.sub;
 import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
 import com.dragoninfo.dcuc.app.entity.sub.DataCla;
-import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
+import com.dragoninfo.dcuc.app.vo.DataResourceSyncTreeVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.data.domain.Page;
@@ -103,7 +103,7 @@ public interface IDataClaService {
      * @param nodes
      * @param path
      */
-    void sync(List<DataResourceTreeVo> nodes, String path);
+    void sync(List<DataResourceSyncTreeVo> nodes, String path);
 
     /**
      * 查询所有列表,只查询第四级,拼接前三级内容

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/IFieldClaService.java

@@ -3,7 +3,7 @@ package com.dragoninfo.dcuc.app.service.sub;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;
 import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
-import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
+import com.dragoninfo.dcuc.app.vo.DataResourceSyncTreeVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.data.domain.Page;
@@ -95,7 +95,7 @@ public interface IFieldClaService {
      * @param nodes
      * @param path
      */
-    void sync(List<DataResourceTreeVo> nodes, String path);
+    void sync(List<DataResourceSyncTreeVo> nodes, String path);
 
     /**
      * 两级字段分级所有列表查询

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/AppColumnRelationServiceImpl.java

@@ -57,6 +57,11 @@ public class AppColumnRelationServiceImpl implements IAppColumnRelationService {
 
     }
 
+    @Override
+    public List<AppColumnRelation> findAll() {
+        return appColumnRelationMapper.selectList(null);
+    }
+
     public AppColumnRelation getByCode(String code) {
         LambdaQueryWrapper<AppColumnRelation> lambdaQuery = Wrappers.lambdaQuery();
         lambdaQuery.eq(AppColumnRelation::getCodeValue, code);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/AppDataResourceInfoServiceImpl.java

@@ -71,7 +71,7 @@ public class AppDataResourceInfoServiceImpl implements IAppDataResourceInfoServi
                 AppDataResourceInfo::getDataClassifyTwoCode, AppDataResourceInfo::getDataLabelOneCode,
                 AppDataResourceInfo::getDataLabelTwoCode, AppDataResourceInfo::getDataLabelThreeCode,
                 AppDataResourceInfo::getDataLabelFourCode, AppDataResourceInfo::getDataLabelFiveCode);
-        query.isNotNull(e -> StringUtils.isNotBlank(e.getDataClassification()));
+        query.isNotNull(AppDataResourceInfo::getDataClassification);
         List<AppDataResourceInfo> appDataResourceInfos = appDataResourceInfoMapper.selectList(query);
         return appDataResourceInfos.stream()
                 .filter(e -> StringUtils.isNotBlank(e.getDataClassification()))

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/DataClaServiceImpl.java

@@ -11,6 +11,7 @@ import com.dragoninfo.dcuc.app.entity.sub.DataCla;
 import com.dragoninfo.dcuc.app.enumresources.sub.DataClaTypeEnum;
 import com.dragoninfo.dcuc.app.mapper.sub.DataClaMapper;
 import com.dragoninfo.dcuc.app.service.sub.IDataClaService;
+import com.dragoninfo.dcuc.app.vo.DataResourceSyncTreeVo;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
@@ -332,11 +333,11 @@ public class DataClaServiceImpl implements IDataClaService {
      * @param path 上级所有id组成的路径 -分隔
      */
     @Override
-    public void sync(List<DataResourceTreeVo> nodes, String path) {
+    public void sync(List<DataResourceSyncTreeVo> nodes, String path) {
         if(CollectionUtils.isEmpty(nodes)) {
             return;
         }
-        for (DataResourceTreeVo node : nodes) {
+        for (DataResourceSyncTreeVo node : nodes) {
             String code = node.getCode();
             DataCla dataCla = getByCodeAndPath(code, path);
             String localPath = path;
@@ -379,7 +380,7 @@ public class DataClaServiceImpl implements IDataClaService {
      * @param node
      * @param dataCla
      */
-    private void updateNode(DataResourceTreeVo node, DataCla dataCla) {
+    private void updateNode(DataResourceSyncTreeVo node, DataCla dataCla) {
         LambdaUpdateWrapper<DataCla> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(DataCla::getName, node.getLabel())
                 .set(DataCla::getUpdateTime, new Date())
@@ -393,7 +394,7 @@ public class DataClaServiceImpl implements IDataClaService {
      * @param path 上级所有id组成的路径 -分隔
      * @param date
      */
-    private void saveNodeAndChild(DataResourceTreeVo node, String path, Date date) {
+    private void saveNodeAndChild(DataResourceSyncTreeVo node, String path, Date date) {
         DataCla dataCla = new DataCla();
         dataCla.setName(node.getLabel());
         dataCla.setCode(node.getCode());
@@ -421,9 +422,9 @@ public class DataClaServiceImpl implements IDataClaService {
         }
         dataClaMapper.insert(dataCla);
         path = path == null? dataCla.getId():path + CommonCons.PATH_SEP + dataCla.getId();
-        List<DataResourceTreeVo> child = node.getChild();
+        List<DataResourceSyncTreeVo> child = node.getChild();
         if(CollectionUtils.isNotEmpty(child)) {
-            for (DataResourceTreeVo childNode : child) {
+            for (DataResourceSyncTreeVo childNode : child) {
                 saveNodeAndChild(childNode, path, date);
             }
         }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/FieldClaServiceImpl.java

@@ -10,6 +10,7 @@ import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
 import com.dragoninfo.dcuc.app.enumresources.sub.FieldClaTypeEnum;
 import com.dragoninfo.dcuc.app.mapper.sub.FieldClaMapper;
 import com.dragoninfo.dcuc.app.service.sub.IFieldClaService;
+import com.dragoninfo.dcuc.app.vo.DataResourceSyncTreeVo;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
@@ -254,11 +255,11 @@ public class FieldClaServiceImpl implements IFieldClaService {
     }
 
     @Override
-    public void sync(List<DataResourceTreeVo> nodes, String path) {
+    public void sync(List<DataResourceSyncTreeVo> nodes, String path) {
         if(CollectionUtils.isEmpty(nodes)) {
             return;
         }
-        for (DataResourceTreeVo node : nodes) {
+        for (DataResourceSyncTreeVo node : nodes) {
             FieldCla fieldCla = getByCodeAndPath(node.getCode(), path);
             String localPath = path;
             if(null == fieldCla) {
@@ -287,7 +288,7 @@ public class FieldClaServiceImpl implements IFieldClaService {
         return fieldClaMapper.selectList(null);
     }
 
-    private void updateNode(DataResourceTreeVo node, FieldCla fieldCla) {
+    private void updateNode(DataResourceSyncTreeVo node, FieldCla fieldCla) {
         LambdaUpdateWrapper<FieldCla> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(FieldCla::getName, node.getLabel())
                 .set(FieldCla::getUpdateTime, new Date())
@@ -301,7 +302,7 @@ public class FieldClaServiceImpl implements IFieldClaService {
      * @param path 上级所有id组成的路径 -分隔
      * @param date
      */
-    private void saveNodeAndChild(DataResourceTreeVo node, String path, Date date) {
+    private void saveNodeAndChild(DataResourceSyncTreeVo node, String path, Date date) {
         FieldCla fieldCla = new FieldCla();
         fieldCla.setName(node.getLabel());
         fieldCla.setCode(node.getCode());
@@ -323,9 +324,9 @@ public class FieldClaServiceImpl implements IFieldClaService {
         }
         fieldClaMapper.insert(fieldCla);
         path = path == null? fieldCla.getId():path + CommonCons.PATH_SEP + fieldCla.getId();
-        List<DataResourceTreeVo> child = node.getChild();
+        List<DataResourceSyncTreeVo> child = node.getChild();
         if(CollectionUtils.isNotEmpty(child)) {
-            for (DataResourceTreeVo childNode : child) {
+            for (DataResourceSyncTreeVo childNode : child) {
                 String localPath = path;
                 saveNodeAndChild(childNode, localPath, date);
             }