添加查询表时加标签

src/main/java/com/keymobile/metadata/metadataRelation/respository/metadata/Neo4jTableRepository.java

@@ -28,21 +28,21 @@ public interface Neo4jTableRepository extends Neo4jRepository<Neo4jTable,Long> {
     @Query("match (n{metadataId:{startTable}} )<-[r1:流向]-(m1)<-[r:流向]-(m{metadataId:{entTable}})   return m1 ")
     List<BaseNode> getSourceEtlScriptBetween2Table(@Param("startTable") String startTable,@Param("entTable") String entTable);
 
-    @Query("match (n{metadataId:{startTable}} )-[r1:流向]->(m1)-[r:流向]->(m{metadataId:{entTable}})   return m1 ")
+    @Query("match (n:Neo4jTable{metadataId:{startTable}} )-[r1:流向]->(m1)-[r:流向]->(m{metadataId:{entTable}})   return m1 ")
     List<BaseNode> getTargetEtlScriptBetween2Table(@Param("startTable") String startTable,@Param("entTable") String entTable);
 
 
-    @Query("match (n{metadataId:{tableId}} )<-[r1:流向]-(m1) <-[r:Composition]-(m)  return m ")
+    @Query("match (n:Neo4jTable{metadataId:{tableId}} )<-[r1:流向]-(m1) <-[r:Composition]-(m)  return m ")
     List<BaseNode> getSourceEtlJob(@Param("tableId") String tableId);
 
-    @Query("match (n{metadataId:{tableId}} )-[r1:流向]->(m1) <-[r:Composition]-(m)   return m ")
+    @Query("match (n:Neo4jTable{metadataId:{tableId}} )-[r1:流向]->(m1) <-[r:Composition]-(m)   return m ")
     List<BaseNode> getTargetEtlJob(@Param("tableId") String tableId);
 
 
-    @Query("match (n{metadataId:{tableId}} ) <-[r:Composition]-(m)   return m ")
+    @Query("match (n:Neo4jTable{metadataId:{tableId}} ) <-[r:Composition]-(m)   return m ")
     List<BaseNode> getSchema(@Param("tableId") String tableId);
 
-    @Query("match (n{metadataId:{tableId}} ) -[r:Composition]->(m:Neo4jColumn)   return m ")
+    @Query("match (n:Neo4jTable{metadataId:{tableId}} ) -[r:Composition]->(m:Neo4jColumn)   return m ")
     List<Neo4jColumn> getColumnByTableId(@Param("tableId") String tableId);
 
 
@@ -54,7 +54,7 @@ public interface Neo4jTableRepository extends Neo4jRepository<Neo4jTable,Long> {
     List<BaseNode> getTargets(@Param("tableId") String tableId);
 
 
-    @Query("match (n{metadataId:{tableId}})<-[r1:Composition]-(m1) return m1 ")
+    @Query("match (n:Neo4jTable{metadataId:{tableId}})<-[r1:Composition]-(m1) return m1 ")
     List<BaseNode> getParent(@Param("tableId") String tableId);
 
 

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

@@ -74,9 +74,16 @@ public class TableServiceImpl implements ITableService {
         List<ReturnNode> etlJobs = new ArrayList<>();
         //获取关联作业，
         List<BaseNode> sourceBaseNodes = neo4jTableRepository.getSourceEtlJob(tableId);
+
         getEtjJobFromSource(etlJobs, sourceBaseNodes);
+
+
         List<BaseNode> targetBaseNodes = neo4jTableRepository.getTargetEtlJob(tableId);
+
+
         getEtlJobFromTarget(etlJobs, targetBaseNodes);
+        long time5 = System.currentTimeMillis();
+
         relationObjects.put("作业",etlJobs);
 
         //质量报告
@@ -107,9 +114,13 @@ public class TableServiceImpl implements ITableService {
                 qualityList.add(returnNode);
             }
         }catch (Exception e){
-            e.printStackTrace();
+            logger.info(" 获取质量错误： "+e.getMessage());
+//            e.printStackTrace();
         }
 
+        long time6 = System.currentTimeMillis();
+        logger.info(" 获取质量报告用时: "+(time6-time5));
+
         relationObjects.put("质量",qualityList);
         //模型
         List<ReturnNode> modelList = new ArrayList<>();
@@ -130,6 +141,9 @@ public class TableServiceImpl implements ITableService {
             e.printStackTrace();
         }
 
+
+        long time7 = System.currentTimeMillis();
+        logger.info(" 获取资产用时: "+(time7-time6));
         relationObjects.put("资产",assetList);
         //标准
         List<ReturnNode> standardList = new ArrayList<>();
@@ -155,6 +169,8 @@ public class TableServiceImpl implements ITableService {
             e.printStackTrace();
         }
 
+        long time8 = System.currentTimeMillis();
+        logger.info(" 获取标准用时: "+(time8-time7));
         relationObjects.put("标准",standardList);
 
         long start = System.currentTimeMillis();
@@ -195,6 +211,7 @@ public class TableServiceImpl implements ITableService {
 
         if(tableId.startsWith(TableEqual)){
             Neo4jTable neo4jTable = neo4jTableRepository.findNeo4jTableByMetadataId(tableId);
+
             ReturnNode returnNode = new ReturnNode();
             if(neo4jTable != null){
                 returnNode.setId(neo4jTable.getMetadataId());
@@ -203,9 +220,9 @@ public class TableServiceImpl implements ITableService {
 
             returnNode.setType(TableModelName);
 
-//                获取属性
-            Map<String,String> attributeMap =  getAttributeMap(tableId);
-            returnNode.setAttributeMaps(attributeMap);
+////                获取属性
+//            Map<String,String> attributeMap =  getAttributeMap(tableId);
+//            returnNode.setAttributeMaps(attributeMap);
             returnTableList.add(returnNode);
         }else if(tableId.startsWith(EtlJobEqual)){
             Neo4jETLJob neo4jETLJob  = neo4jETLJobRepository.findNeo4jETLJobByMetadataId(tableId);
@@ -913,6 +930,7 @@ public class TableServiceImpl implements ITableService {
         List<ReturnNode> sourceTables = new ArrayList<>();
 
         List<ReturnNode> neo4jTableList = getCurrentTableInfo(tableId);
+
         sourceAndTargetTable.put("当前表",neo4jTableList);
 
         getSourceTable(tableId ,sourceTables);