分层兼顾 有没有"数据"二字2。

src/main/java/com/keymobile/metadata/metadataRelation/service/impl/MetadataServiceImpl.java

@@ -1333,6 +1333,14 @@ public class MetadataServiceImpl implements IMetadataService {
         layer.add(SchemaLayerObject.jishiceng);
         layer.add(SchemaLayerObject.yingyongceng);
 
+        layer.add(SchemaLayerObject.tieyuancengData);
+        layer.add(SchemaLayerObject.jichucengData);
+        layer.add(SchemaLayerObject.zhenghecengData);
+        layer.add(SchemaLayerObject.tongjicengData);
+        layer.add(SchemaLayerObject.fenxicengData);
+        layer.add(SchemaLayerObject.jishicengData);
+        layer.add(SchemaLayerObject.yingyongcengData);
+
         Random r = new Random(1);
 
         List<MongoData> catalogDataList = mongoDbServiceImpl.findDatabaseByparentId("root",catalogName);

src/main/java/com/keymobile/metadata/metadataRelation/service/impl/SchemaServiceImpl.java

@@ -115,6 +115,16 @@ public class SchemaServiceImpl implements ISchemaService {
         layer.add(SchemaLayerObject.fenxiceng);
         layer.add(SchemaLayerObject.jishiceng);
         layer.add(SchemaLayerObject.yingyongceng);
+
+        layer.add(SchemaLayerObject.tieyuancengData);
+        layer.add(SchemaLayerObject.jichucengData);
+        layer.add(SchemaLayerObject.zhenghecengData);
+        layer.add(SchemaLayerObject.tongjicengData);
+        layer.add(SchemaLayerObject.fenxicengData);
+        layer.add(SchemaLayerObject.jishicengData);
+        layer.add(SchemaLayerObject.yingyongcengData);
+
+
         String returnLabel = "";
         List<String> metadataIds = new ArrayList<>();
         metadataIds.add(schemaId);
@@ -243,6 +253,15 @@ public class SchemaServiceImpl implements ISchemaService {
         layer.add(SchemaLayerObject.fenxiceng);
         layer.add(SchemaLayerObject.jishiceng);
         layer.add(SchemaLayerObject.yingyongceng);
+
+        layer.add(SchemaLayerObject.tieyuancengData);
+        layer.add(SchemaLayerObject.jichucengData);
+        layer.add(SchemaLayerObject.zhenghecengData);
+        layer.add(SchemaLayerObject.tongjicengData);
+        layer.add(SchemaLayerObject.fenxicengData);
+        layer.add(SchemaLayerObject.jishicengData);
+        layer.add(SchemaLayerObject.yingyongcengData);
+
         String returnLabel = "";
 
         try {

src/main/java/com/keymobile/metadata/metadataRelation/service/impl/SystemServiceImpl.java

@@ -51,19 +51,19 @@ public class SystemServiceImpl implements ISystemService {
             returnNode.setType("Schema");
 
             String label = neo4jSchema.getLabel();
-            if(SchemaLayerObject.tieyuanceng.equals(label)){
+            if(SchemaLayerObject.tieyuanceng.equals(label) ||SchemaLayerObject.tieyuancengData.equals(label) ){
                 tyshcList.add(returnNode);
-            }else if(SchemaLayerObject.jichuceng.equals(label)){
+            }else if(SchemaLayerObject.jichuceng.equals(label) ||SchemaLayerObject.jichucengData.equals(label)){
                 jcshcList.add(returnNode);
-            }else if(SchemaLayerObject.zhengheceng.equals(label)){
+            }else if(SchemaLayerObject.zhengheceng.equals(label) ||SchemaLayerObject.zhenghecengData.equals(label)){
                 zhshcList.add(returnNode);
-            }else if(SchemaLayerObject.tongjiceng.equals(label)){
+            }else if(SchemaLayerObject.tongjiceng.equals(label) ||SchemaLayerObject.tongjicengData.equals(label)){
                 tjshcList.add(returnNode);
-            }else if(SchemaLayerObject.fenxiceng.equals(label)){
+            }else if(SchemaLayerObject.fenxiceng.equals(label) ||SchemaLayerObject.fenxicengData.equals(label)){
                 fxshcList.add(returnNode);
-            }else if(SchemaLayerObject.jishiceng.equals(label)){
+            }else if(SchemaLayerObject.jishiceng.equals(label) ||  SchemaLayerObject.jishicengData.equals(label)){
                 jsshcList.add(returnNode);
-            }else if(SchemaLayerObject.yingyongceng.equals(label)){
+            }else if(SchemaLayerObject.yingyongceng.equals(label) ||SchemaLayerObject.yingyongcengData.equals(label)){
                 yysjcList.add(returnNode);
             }else {
 //                schemaMap.get("未分层").add(returnNode);

src/main/java/com/keymobile/metadata/metadataRelation/util/SchemaLayerObject.java

@@ -2,7 +2,7 @@ package com.keymobile.metadata.metadataRelation.util;
 
 public  class SchemaLayerObject {
 
-    public static   String tieyuanceng = "贴源层";
+    public static String tieyuanceng = "贴源层";
     public static String jichuceng = "基础层";
     public static String zhengheceng = "整合层";
     public static String tongjiceng = "统计层";