1.修复代码审核发现的问题。

src/main/java/com/keymobile/metadata/metadataRelation/controller/RelationalGraphController.java

 package com.keymobile.metadata.metadataRelation.controller;
 
-import com.keymobile.metadata.metadataRelation.config.FeignClientConfig;
 import com.keymobile.metadata.metadataRelation.logging.LogConstants;
 import com.keymobile.metadata.metadataRelation.logging.LogManager;
-import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jSchema;
 import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnNode;
 import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnReslult;
-import com.keymobile.metadata.metadataRelation.remote.DataAssertRemoteService;
 import com.keymobile.metadata.metadataRelation.remote.DataStandardRemoteService;
 import com.keymobile.metadata.metadataRelation.remote.TagRemoteService;
 import com.keymobile.metadata.metadataRelation.service.*;
-import com.keymobile.metadata.metadataRelation.service.impl.SystemServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.sf.json.JSONObject;
-import org.apache.catalina.security.SecurityConfig;
-import org.apache.commons.lang3.time.DateUtils;
-import org.hibernate.loader.custom.Return;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.sql.SQLOutput;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -66,6 +57,9 @@ public class RelationalGraphController {
     @Autowired
     private TagRemoteService tagRemoteService;
 
+    private String etlJobModelName = "ETLJob=";
+    private String tableModelName = "Table=";
+    private String etlScriptModelName = "ETLScript=";
     //测试标准的接口
     @ApiOperation(tags = "", value = "测试标准的接口")
     @RequestMapping(path = "/testDataAssertRemoteService", method = RequestMethod.GET)
@@ -197,11 +191,11 @@ public class RelationalGraphController {
     @RequestMapping(path = "/getAttributeByMetadataId", method = RequestMethod.GET)
     public Map<String,String> getAttributeByMetadataId(String metadataId){
         Map<String,String> attributeMap = new HashMap<>();
-        if(metadataId.startsWith("Table=")){
+        if(metadataId.startsWith(tableModelName)){
             attributeMap = tableService.getAttributeByTableId(metadataId);
-        } else if(metadataId.startsWith("ETLJob=")){
+        } else if(metadataId.startsWith(etlJobModelName)){
             attributeMap = etlJobService.getAttributeByETLJobId(metadataId);
-        }else if(metadataId.startsWith("ETLScript=")) {
+        }else if(metadataId.startsWith(etlScriptModelName)) {
             attributeMap = etlScriptService.getAttributeByETLScriptId(metadataId);
         }else {
             attributeMap = metadataService.getMetaDataByMetadataId(metadataId);
@@ -218,9 +212,9 @@ public class RelationalGraphController {
     public Map<String, List<ReturnNode>> getChildren(String metadataId,String size) {
         logger.info("传入的元数据Id是："+metadataId);
         Map<String ,List<ReturnNode>> returnNodeMap = new HashMap<>();
-        if(metadataId.startsWith("Table=")){
+        if(metadataId.startsWith(tableModelName)){
             returnNodeMap =  tableService.getchildrenByTableId(metadataId);
-        }else if(metadataId.startsWith("ETLJob=")) {
+        }else if(metadataId.startsWith(etlJobModelName)) {
             returnNodeMap =  etlJobService.getchildrenByEtlJobId(metadataId);
         }
         return   returnNodeMap;
@@ -248,15 +242,15 @@ public class RelationalGraphController {
     @RequestMapping(path = "/getRelationTablesTableId", method = RequestMethod.GET)
     public Map<String,List<ReturnNode>> getRelationTablesTableId(String tableId){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        LogManager.logInfo(LogConstants.CTX_Relation, "用户 "+ getUserName() + " 在 "+ sdf.format(new Date()) + " 查看了 "+tableId+"的全链分析" );
+        LogManager.logInfo(LogConstants.CTX_RELATION, "用户 "+ getUserName() + " 在 "+ sdf.format(new Date()) + " 查看了 "+tableId+"的全链分析" );
 
         Map<String, List<ReturnNode>> relationTables = new HashMap<>();
         long start = System.currentTimeMillis();
-        if(tableId.startsWith("Table=")){
+        if(tableId.startsWith(tableModelName)){
             relationTables  = tableService.getSourceAndTargetTableByTableId (tableId);
-        }else if(tableId.startsWith("ETLJob=")){
+        }else if(tableId.startsWith(etlJobModelName)){
             relationTables  = etlJobService.getSourceAndTargetObjectByMedataDataId (tableId);
-        }else if(tableId.startsWith("ETLScript=")){
+        }else if(tableId.startsWith(etlScriptModelName)){
             relationTables  = etlScriptService.getSourceAndTargetObjectByMedataDataId (tableId);
         }else if(tableId.startsWith("File=")){
             relationTables  = fileService.getSourceAndTargetObjectByMedataDataId (tableId);
@@ -287,7 +281,7 @@ public class RelationalGraphController {
     @RequestMapping(path = "/getRelationObjectByTableId", method = RequestMethod.GET)
     public Map<String,List<ReturnNode>> getRelationObjectByTableId(String tableId){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        LogManager.logInfo(LogConstants.CTX_Relation, "用户 "+ getUserName() + " 在 "+ sdf.format(new Date()) + " 查看了 "+tableId+"的关系分析" );
+        LogManager.logInfo(LogConstants.CTX_RELATION, "用户 "+ getUserName() + " 在 "+ sdf.format(new Date()) + " 查看了 "+tableId+"的关系分析" );
 
         long start = System.currentTimeMillis();
         Map<String, List<ReturnNode>> relationObjects = tableService.getRelationObjectByTableId (tableId);
@@ -346,14 +340,14 @@ public class RelationalGraphController {
     @ApiOperation(tags = "", value = "传入环境id，系统名，schema名，表名，获取表id")
     @RequestMapping(path = "/getTableIdByEnvironmentSystemTableName", method = RequestMethod.GET)
     public String getTableIdByEnvironmentSystemTableName(String environment,String system,String tableName){
-        logger.info("获取表id。");
+        logger.info("获取环境id："+environment +" ;系统：" + system+ " ;table:"+tableName);
         return  tableService.getTableId(environment,system,tableName);
     }
 
     @ApiOperation(tags = "", value = "传入质量相关的字段id，返回与该字段id有关系的字段，表，数据库，系统")
     @RequestMapping(path = "/getQualityDataRelations", method = RequestMethod.GET)
     public ReturnReslult getQualityDataRelations(String  columnId){
-        logger.info("获取表id。"+columnId);
+        logger.info("传入的字段id："+columnId);
         return tableService.getQualityData(columnId);
     }
 

src/main/java/com/keymobile/metadata/metadataRelation/logging/LogConstants.java

 package com.keymobile.metadata.metadataRelation.logging;
 
-public interface LogConstants {
+public final class LogConstants {
 
-    public static final String CTX_Relation = "metadata.relation";
-//    public static final String CTX_HARVESTERTASK = "harvester.HARVESTERTASK";
-//    public static final String CTX_TASKSCHEDULE = "harvester.TASKSCHEDULE";
-//    public static final String CTX_TASKEXTRACTDETAIL = "harvester.TASKEXTRACTDETAIL";
+    public static final String CTX_RELATION = "metadata.relation";
 }

src/main/java/com/keymobile/metadata/metadataRelation/service/AsyncDataFromMongoToNeo4j.java

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 @Service
 @EnableAsync
@@ -26,6 +28,8 @@ public class AsyncDataFromMongoToNeo4j {
     private IMetadataRelationService metadataRelationService;
 
     @Autowired
+    private AsyncRelation asyncRelation ;
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     //定时同步数据，
@@ -44,9 +48,9 @@ public class AsyncDataFromMongoToNeo4j {
                 return user;
             }
         });
-        for(MongoData scope:scopeList){
+//        for(MongoData scope:scopeList){
 //            asyncDataFromMongoToNeo4j(scope.get_id());
-        }
+//        }
 
     }
 
@@ -71,7 +75,7 @@ public class AsyncDataFromMongoToNeo4j {
         metadataService.syschroMetadataFromMongo(catalogName,mongoDataList);
 
         //再同步元数据的横向关系
-        metadataService.syschroTable2EtlJobRelations(catalogName);
+//        metadataService.syschroTable2EtlJobRelations(catalogName);
 
         //同步1104报表
 //        metadataService.syschro1104Relations(catalogName);
@@ -84,13 +88,23 @@ public class AsyncDataFromMongoToNeo4j {
         long end = System.currentTimeMillis();
         logger.info("同步数据完成，用时："+(end-start));
     }
-
     @Async
     public void asyncJobFromMongo2Neo4j(String catalogName,String jobId) {
+
+        CompletableFuture<String> future = asyncRelation.asyncJobFromMongo2Neo4j(catalogName, jobId);
+        try {
+            String message = future.get();
+            System.out.println("message:"+message);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+        }
+
         //先按照环境id，作业id，删除关系，然后同步关系，
         // 一般来说，关系的字段已经存在neo4j，但是sql不一定存在，
         // 如果sql不存在，需要先同步sql ，srcipt，job，再建立关系。
-        metadataRelationService.deleteRelationByJobId(catalogName,jobId);
-        metadataRelationService.syschroRelationFromMongo(catalogName,jobId);
+//        metadataRelationService.deleteRelationByJobId(catalogName,jobId);
+//        metadataRelationService.syschroRelationFromMongo(catalogName,jobId);
     }
 }

src/main/java/com/keymobile/metadata/metadataRelation/service/AsyncRelation.java

+package com.keymobile.metadata.metadataRelation.service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.CompletableFuture;
+
+@Service
+public class AsyncRelation {
+    private static final Logger logger = LoggerFactory.getLogger(AsyncRelation.class);
+
+    public synchronized CompletableFuture<String> asyncJobFromMongo2Neo4j(String catalogName, String jobId) {
+        logger.info("开始异步 同步数据，catalog="+catalogName + " jobId="+jobId);
+        //先按照环境id，作业id，删除关系，然后同步关系，
+        // 一般来说，关系的字段已经存在neo4j，但是sql不一定存在，
+        // 如果sql不存在，需要先同步sql ，srcipt，job，再建立关系。
+//        metadataRelationService.deleteRelationByJobId(catalogName,jobId);
+//        metadataRelationService.syschroRelationFromMongo(catalogName,jobId);
+
+        return CompletableFuture.completedFuture("同步 环境="+catalogName+" jobId="+jobId+"完成。");
+    }
+}

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

@@ -191,7 +191,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
 //              (m{metadataId:"Table=1=d644b631fa8c434e928bcd1f1665b060"})
 //        create (n)<-[r:Composition]-(m)
 //        return n,m,r
-        String cypher = " match (n{metadataId:\""+startId+"\"}),(m{metadataId:\""+endId+"\"}) merge (n)-[r:"+relationType+"]->(m) set r.jobId ="+jobId;
+        String cypher = " match (  n   {metadataId:\""+startId+"\"}),(m  { metadataId:\""+endId+"\"}) merge (n)-[r:"+relationType+"]->(m) set r.jobId ="+jobId;
 
 //        logger.info("运行保存关系完成：" + cypher);
         session.run(cypher);
@@ -202,12 +202,12 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
         Neo4jConfig neo4jConfig = new Neo4jConfig();
         Driver neo4jConnection = neo4jConfig.getNeo4jConnection();
         Session session = neo4jConnection.session();
-//        match (n{metadataId:"Column=1=d9c2d67e56a3428e8e4f22918782437f"}),
-//              (m{metadataId:"Table=1=d644b631fa8c434e928bcd1f1665b060"})
-//        create (n)<-[r:Composition]-(m)
-//        return n,m,r
-        String cypher = " match (n{metadataId:\""+startId+"\"}),(m{metadataId:\""+endId+"\"}) " +
-                "merge (n)-[r:"+relationType+"]->(m) set r.jobId ="+description + " and r.description = "+ description;
+//        match  (n { metadataId:"Column=1=0c8a3201eaf349918363471496c19a96"}),
+//        ( m { metadataId:"SQL=1=b33fc95c948a43d7af504632bf6e7641"} )
+//        merge (n)-[r:流向]->(m)
+//        set  r={jobId:"0",descriptio:"0" }
+        String cypher = "match  (n { metadataId:\""+startId+"\"}),  ( m { metadataId:\""+endId+"\"} ) " +
+                "merge (n)-[r:"+relationType+"]->(m) set r = {jobId:"+jobId+",description:"+description+" }";// set r.jobId ="+description + " and r.description = "+ description;
 
 //        logger.info("运行保存关系完成：" + cypher);
         session.run(cypher);

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

@@ -20,6 +20,10 @@ public class ColumnServiceImpl implements IColumnService {
     @Autowired
     private Neo4jColumnRepository neo4jColumnRepository;
 
+    private String columnModelName = "Column";
+
+    private String columnModelEqual = "Column=";
+    private String etlSqlModelEqual = "ETLSql=";
     @Override
     public ReturnReslult getRelationAboutColumn(String columnId) {
         ReturnReslult returnReslult = new ReturnReslult();
@@ -32,15 +36,15 @@ public class ColumnServiceImpl implements IColumnService {
         ReturnNode returnColumn = new ReturnNode();
         returnColumn.setId(neo4jColumn.getMetadataId());
         returnColumn.setName(neo4jColumn.getName());
-        returnColumn.setType("Column");
+        returnColumn.setType(columnModelName);
         returnReslult.getNodes().add(returnColumn);
 
         List<BaseNode> targetBaseNodeList = neo4jColumnRepository.getTargetColumn(columnId);
         for(BaseNode targetBaseNode:targetBaseNodeList){
-            if(targetBaseNode.getMetadataId().startsWith("Column=")){
+            if(targetBaseNode.getMetadataId().startsWith(columnModelEqual)){
                 //是字段
                 targetNodeList.add(targetBaseNode);
-            }else if(targetBaseNode.getMetadataId().startsWith("ETLSql=")){
+            }else if(targetBaseNode.getMetadataId().startsWith(etlSqlModelEqual)){
                 getTargetRelationAboutColumns(targetBaseNode.getMetadataId(),targetNodeList);
                 //不是字段，就继续找
             }
@@ -50,7 +54,7 @@ public class ColumnServiceImpl implements IColumnService {
             ReturnNode returnNode = new ReturnNode();
             returnNode.setId(sourceNode.getMetadataId());
             returnNode.setName(sourceNode.getName());
-            returnNode.setType("Column");
+            returnNode.setType(columnModelName);
             returnNodeMap.put(sourceNode.getMetadataId(),returnNode);
 
             ReturnEdge returnEdge = new ReturnEdge();
@@ -64,10 +68,10 @@ public class ColumnServiceImpl implements IColumnService {
         List<BaseNode> sourceNodeList = new ArrayList<>();
         List<BaseNode> sourceBaseNodeList = neo4jColumnRepository.getSourceColumn(columnId);
         for(BaseNode sourceBaseNode:sourceBaseNodeList){
-            if(sourceBaseNode.getMetadataId().startsWith("Column=")){
+            if(sourceBaseNode.getMetadataId().startsWith(columnModelEqual)){
                 //是字段
                 sourceNodeList.add(sourceBaseNode);
-            }else if(sourceBaseNode.getMetadataId().startsWith("ETLSql=")){
+            }else if(sourceBaseNode.getMetadataId().startsWith(etlSqlModelEqual)){
                 getSourceRelationAboutColumns(sourceBaseNode.getMetadataId(),sourceNodeList);
                 //不是字段，就继续找
             }
@@ -77,7 +81,7 @@ public class ColumnServiceImpl implements IColumnService {
             ReturnNode returnNode = new ReturnNode();
             returnNode.setId(sourceNode.getMetadataId());
             returnNode.setName(sourceNode.getName());
-            returnNode.setType("Column");
+            returnNode.setType(columnModelName);
             returnNodeMap.put(sourceNode.getMetadataId(),returnNode);
 
             ReturnEdge returnEdge = new ReturnEdge();
@@ -101,16 +105,16 @@ public class ColumnServiceImpl implements IColumnService {
 
     private void getSourceRelationAboutColumns(String metadataId, List<BaseNode> sourceReturnNodeList) {
         List<BaseNode> sourceNodeList = new ArrayList<>();
-        if(metadataId.startsWith("ETLSql=")){
+        if(metadataId.startsWith(etlSqlModelEqual)){
             sourceNodeList = neo4jColumnRepository.getSourceColumn(metadataId);
         }else if(metadataId.startsWith("File=")){
 //            targetNodeList = neo4jFileRepository.getTargets(metadataId);
         }
         for(BaseNode sourceNode:sourceNodeList){
-            if(sourceNode.getMetadataId().startsWith("Column=")){
+            if(sourceNode.getMetadataId().startsWith(columnModelEqual)){
                 //是表
                 sourceReturnNodeList.add(sourceNode);
-            }else if(sourceNode.getMetadataId().startsWith("ETLSql=")){
+            }else if(sourceNode.getMetadataId().startsWith(etlSqlModelEqual)){
                 getSourceRelationAboutColumns(sourceNode.getMetadataId(),sourceReturnNodeList);
                 //不是表，就继续找
             }
@@ -119,16 +123,16 @@ public class ColumnServiceImpl implements IColumnService {
 
     private void getTargetRelationAboutColumns(String metadataId, List<BaseNode> returnNodeList) {
         List<BaseNode> targetNodeList = new ArrayList<>();
-        if(metadataId.startsWith("ETLSql=")){
+        if(metadataId.startsWith(etlSqlModelEqual)){
             targetNodeList = neo4jColumnRepository.getTargetColumn(metadataId);
         }else if(metadataId.startsWith("File=")){
 //            targetNodeList = neo4jFileRepository.getTargets(metadataId);
         }
         for(BaseNode targetNode:targetNodeList){
-            if(targetNode.getMetadataId().startsWith("Column=")){
+            if(targetNode.getMetadataId().startsWith(columnModelEqual)){
                 //是表
                 returnNodeList.add(targetNode);
-            }else if(targetNode.getMetadataId().startsWith("ETLSql=")){
+            }else if(targetNode.getMetadataId().startsWith(etlSqlModelEqual)){
                 getTargetRelationAboutColumns(targetNode.getMetadataId(),returnNodeList);
                 //不是表，就继续找
             }

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

@@ -27,6 +27,7 @@ public class ETLJobServiceImpl implements IETLJobService {
         return null;
     }
 
+    private String tableModelName = "Table";
     @Override
     public Map<String, String> getAttributeByETLJobId(String tableId) {
         Map<String,String> attributeMap =  getAttributeMap(tableId);
@@ -84,7 +85,7 @@ public class ETLJobServiceImpl implements IETLJobService {
                 ReturnNode returnNode = new ReturnNode();
                 returnNode.setId(baseNode.getMetadataId());
                 returnNode.setName(baseNode.getName());
-                returnNode.setType("Table");
+                returnNode.setType(tableModelName);
 //                获取属性
 //                Map<String,String> attributeMap =  getAttributeMap(metadataId);
 //                List<BaseNode> sourceEtlScriptBetween2TableList = neo4jTableRepository.getSourceEtlScriptBetween2Table(tableId, metadataId);
@@ -115,7 +116,7 @@ public class ETLJobServiceImpl implements IETLJobService {
                 ReturnNode returnNode = new ReturnNode();
                 returnNode.setId(baseNode.getMetadataId());
                 returnNode.setName(baseNode.getName());
-                returnNode.setType("Table");
+                returnNode.setType(tableModelName);
 //                获取属性
 //                Map<String,String> attributeMap =  getAttributeMap(metadataId);
 //                List<BaseNode> sourceEtlScriptBetween2TableList = neo4jTableRepository.getSourceEtlScriptBetween2Table(tableId, metadataId);
@@ -144,7 +145,7 @@ public class ETLJobServiceImpl implements IETLJobService {
         ReturnNode returnNode = new ReturnNode();
         returnNode.setId(neo4jETLJob.getMetadataId());
         returnNode.setName(neo4jETLJob.getName());
-        returnNode.setType("Table");
+        returnNode.setType(tableModelName);
         returnTableList.add(returnNode);
 //                获取属性
 //        Map<String,String> attributeMap =  getAttributeMap(tableId);

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

@@ -19,6 +19,10 @@ public class ETLScriptServiceImpl implements IETLScriptService {
     @Autowired
     private MetadataRepoRemoteService metadataRepoRemoteService;
 
+    private  String tableModelName = "Table=";
+
+    private  String etlScriptModelName = "ETLScript";
+
     @Autowired
     Neo4jETLScriptRepository neo4jETLScriptRepository;
     @Override
@@ -50,14 +54,14 @@ public class ETLScriptServiceImpl implements IETLScriptService {
         List<BaseNode> sourceBaseNodeList = neo4jETLScriptRepository.getTargets(scriptId);
         for(BaseNode baseNode:sourceBaseNodeList){
             String metadataId = baseNode.getMetadataId();
-            if(metadataId.startsWith("Table=")||metadataId.startsWith("ETLScript=")){
+            if(metadataId.startsWith(tableModelName)||metadataId.startsWith("ETLScript=")){
                 ReturnNode returnNode = new ReturnNode();
                 returnNode.setId(baseNode.getMetadataId());
                 returnNode.setName(baseNode.getName());
-                if(metadataId.startsWith("Table=")){
+                if(metadataId.startsWith(tableModelName)){
                     returnNode.setType("Table");
                 }else {
-                    returnNode.setType("ETLScript");
+                    returnNode.setType(etlScriptModelName);
                 }
 //                获取属性
 //                Map<String,String> attributeMap =  getAttributeMap(metadataId);
@@ -85,14 +89,14 @@ public class ETLScriptServiceImpl implements IETLScriptService {
         List<BaseNode> sourceBaseNodeList = neo4jETLScriptRepository.getSources(scriptId);
         for(BaseNode baseNode:sourceBaseNodeList){
             String metadataId = baseNode.getMetadataId();
-            if(metadataId.startsWith("Table=")||metadataId.startsWith("ETLScript=")){
+            if(metadataId.startsWith(tableModelName)||metadataId.startsWith("ETLScript=")){
                 ReturnNode returnNode = new ReturnNode();
                 returnNode.setId(baseNode.getMetadataId());
                 returnNode.setName(baseNode.getName());
-                if(metadataId.startsWith("Table=")){
+                if(metadataId.startsWith(tableModelName)){
                     returnNode.setType("Table");
                 }else {
-                    returnNode.setType("ETLScript");
+                    returnNode.setType(etlScriptModelName);
                 }
 //                获取属性
 //                Map<String,String> attributeMap =  getAttributeMap(metadataId);
@@ -122,7 +126,7 @@ public class ETLScriptServiceImpl implements IETLScriptService {
         ReturnNode returnNode = new ReturnNode();
         returnNode.setId(neo4jETLScript.getMetadataId());
         returnNode.setName(neo4jETLScript.getName());
-        returnNode.setType("ETLScript");
+        returnNode.setType(etlScriptModelName);
         returnTableList.add(returnNode);
 //                获取属性
 //        Map<String,String> attributeMap =  getAttributeMap(tableId);

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

@@ -27,6 +27,10 @@ public class MongoDbServiceImpl {
 
     private static final String PREFIX_METADATA_NODE = "Metadata_";
 
+    private static final String PARENT_ID = "parentId";
+    private static final String INPUT = "Input";
+    private static final String OUTPUT = "Output";
+
     /**
      * 查询所有
      *
@@ -56,7 +60,7 @@ public class MongoDbServiceImpl {
         logger.info("开始从mongo获取元数据："+ parentName);
         try {
             Query query = new Query();
-            query.addCriteria(Criteria.where("parentId").is(parentName));
+            query.addCriteria(Criteria.where(PARENT_ID).is(parentName));
             List<MongoData> mongoDataList = mongoTemplate.find(query, MongoData.class,PREFIX_METADATA_NODE+catalogName);
 
             return mongoDataList;
@@ -77,7 +81,7 @@ public class MongoDbServiceImpl {
 //        logger.info("开始从mongo获取元数据："+ parentId);
         try {
             Query query = new Query();
-            query.addCriteria(Criteria.where("parentId").is(parentId));
+            query.addCriteria(Criteria.where(PARENT_ID).is(parentId));
             List<MongoData> mongoDataList = mongoTemplate.find(query, MongoData.class,PREFIX_METADATA_NODE+catalogName);
 
             return mongoDataList;// mongoTemplate.findAll(MongoData.class, "md_relation_" + catalogName);
@@ -92,14 +96,14 @@ public class MongoDbServiceImpl {
      * 分页查询所有子节点,返回document
      *
      * public List<Document> findRelationByPage(Pageable pageable, String catalogName) {
-     *         Query query = new Query(new Criteria().orOperator(Criteria.where("type").is("Input"),Criteria.where("type").is("Output")));
+     *         Query query = new Query(new Criteria().orOperator(Criteria.where("type").is(INPUT),Criteria.where("type").is(OUTPUT)));
      *         query.with(pageable);
      *         return mongoTemplate.find(query, Document.class, PREFIX_MD_RELATION + catalogName);
      *     }
      */
     public List<Document> getDocumentByparentIdByPage(Pageable pageable, String catalogName,String parentId) {
         logger.info("开始从mongo查找子节点："+ parentId);
-        Query query = Query.query(Criteria.where("parentId").is(parentId));
+        Query query = Query.query(Criteria.where(PARENT_ID).is(parentId));
         query.with(pageable);
         return mongoTemplate.find(query, Document.class, PREFIX_METADATA_NODE + catalogName);
 
@@ -108,7 +112,7 @@ public class MongoDbServiceImpl {
 
 
     public long countDocumentByParentId(Pageable pageable, String catalogName,String parentId) {
-        Query query = Query.query(Criteria.where("parentId").is(parentId));
+        Query query = Query.query(Criteria.where(PARENT_ID).is(parentId));
         query.with(pageable);
         return mongoTemplate.count(query, Document.class, PREFIX_METADATA_NODE + catalogName);
     }
@@ -154,13 +158,13 @@ public class MongoDbServiceImpl {
     }
 
     public List<Document> findRelationByPage(Pageable pageable, String catalogName) {
-        Query query = new Query(new Criteria().orOperator(Criteria.where("type").is("Input"),Criteria.where("type").is("Output")));
+        Query query = new Query(new Criteria().orOperator(Criteria.where("type").is(INPUT),Criteria.where("type").is(OUTPUT)));
         query.with(pageable);
         return mongoTemplate.find(query, Document.class, PREFIX_MD_RELATION + catalogName);
     }
 
     public long countRelation(Pageable pageable, String catalogName) {
-        Query query = new Query(new Criteria().orOperator(Criteria.where("type").is("Input"),Criteria.where("type").is("Output")));
+        Query query = new Query(new Criteria().orOperator(Criteria.where("type").is(INPUT),Criteria.where("type").is(OUTPUT)));
         query.with(pageable);
         return mongoTemplate.count(query, Document.class, PREFIX_MD_RELATION + catalogName);
     }
@@ -168,20 +172,20 @@ public class MongoDbServiceImpl {
 
     public long countRelationByJobId(Pageable pageable, String catalogName,String jobId) {
         Query query = new Query(new Criteria() .andOperator(Criteria.where("jobId").is(jobId),
-                new Criteria().orOperator(Criteria.where("type").is("Input"),Criteria.where("type").is("Output"))
+                new Criteria().orOperator(Criteria.where("type").is(INPUT),Criteria.where("type").is(OUTPUT))
                             )
                             );
 
-//        Query query = new Query(new Criteria().orOperator(Criteria.where("type").is("Input"),Criteria.where("type").is("Output")));
+//        Query query = new Query(new Criteria().orOperator(Criteria.where("type").is(INPUT),Criteria.where("type").is(OUTPUT)));
         query.with(pageable);
         return mongoTemplate.count(query, Document.class, PREFIX_MD_RELATION + catalogName);
     }
     public List<Document> findRelationByJobIdByPage(Pageable pageable, String catalogName,String jobId) {
         Query query = new Query(new Criteria() .andOperator(Criteria.where("jobId").is(jobId),
-                new Criteria().orOperator(Criteria.where("type").is("Input"),Criteria.where("type").is("Output"))
+                new Criteria().orOperator(Criteria.where("type").is(INPUT),Criteria.where("type").is(OUTPUT))
         )
         );
-//        Query query = new Query(new Criteria().orOperator(Criteria.where("type").is("Input"),Criteria.where("type").is("Output")));
+//        Query query = new Query(new Criteria().orOperator(Criteria.where("type").is(INPUT),Criteria.where("type").is(OUTPUT)));
         query.with(pageable);
         return mongoTemplate.find(query, Document.class, PREFIX_MD_RELATION + catalogName);
     }

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

@@ -50,24 +50,7 @@ public class SystemServiceImpl implements ISystemService {
             returnNode.setName(neo4jSchema.getName());
             returnNode.setType("Schema");
 
-            String label = neo4jSchema.getLabel();
-            if(SchemaLayerObject.tieyuanceng.equals(label) ||SchemaLayerObject.tieyuancengData.equals(label) ){
-                tyshcList.add(returnNode);
-            }else if(SchemaLayerObject.jichuceng.equals(label) ||SchemaLayerObject.jichucengData.equals(label)){
-                jcshcList.add(returnNode);
-            }else if(SchemaLayerObject.zhengheceng.equals(label) ||SchemaLayerObject.zhenghecengData.equals(label)){
-                zhshcList.add(returnNode);
-            }else if(SchemaLayerObject.tongjiceng.equals(label) ||SchemaLayerObject.tongjicengData.equals(label)){
-                tjshcList.add(returnNode);
-            }else if(SchemaLayerObject.fenxiceng.equals(label) ||SchemaLayerObject.fenxicengData.equals(label)){
-                fxshcList.add(returnNode);
-            }else if(SchemaLayerObject.jishiceng.equals(label) ||  SchemaLayerObject.jishicengData.equals(label)){
-                jsshcList.add(returnNode);
-            }else if(SchemaLayerObject.yingyongceng.equals(label) ||SchemaLayerObject.yingyongcengData.equals(label)){
-                yysjcList.add(returnNode);
-            }else {
-//                schemaMap.get("未分层").add(returnNode);
-            }
+            SetLabel(tyshcList, jcshcList, zhshcList, tjshcList, fxshcList, jsshcList, yysjcList, neo4jSchema, returnNode);
 
 //            if(schemaMap .containsKey(label)){
 //                List<ReturnNode> returnNodeList = schemaMap.get(label);
@@ -81,6 +64,11 @@ public class SystemServiceImpl implements ISystemService {
 //            }
         }
 
+        SetLabelToSchema(schemaMap, tyshcList, jcshcList, zhshcList, tjshcList, fxshcList, jsshcList, yysjcList);
+        return schemaMap;
+    }
+
+    private void SetLabelToSchema(Map<String, List<ReturnNode>> schemaMap, List<ReturnNode> tyshcList, List<ReturnNode> jcshcList, List<ReturnNode> zhshcList, List<ReturnNode> tjshcList, List<ReturnNode> fxshcList, List<ReturnNode> jsshcList, List<ReturnNode> yysjcList) {
         if(tyshcList !=null && tyshcList.size()!=0){
             schemaMap.put(SchemaLayerObject.tieyuanceng,tyshcList);
         }
@@ -102,7 +90,27 @@ public class SystemServiceImpl implements ISystemService {
         if(yysjcList !=null && yysjcList.size()!=0){
             schemaMap.put(SchemaLayerObject.yingyongceng,yysjcList);
         }
-        return schemaMap;
+    }
+
+    private void SetLabel(List<ReturnNode> tyshcList, List<ReturnNode> jcshcList, List<ReturnNode> zhshcList, List<ReturnNode> tjshcList, List<ReturnNode> fxshcList, List<ReturnNode> jsshcList, List<ReturnNode> yysjcList, Neo4jSchema neo4jSchema, ReturnNode returnNode) {
+        String label = neo4jSchema.getLabel();
+        if(SchemaLayerObject.tieyuanceng.equals(label) ||SchemaLayerObject.tieyuancengData.equals(label) ){
+            tyshcList.add(returnNode);
+        }else if(SchemaLayerObject.jichuceng.equals(label) ||SchemaLayerObject.jichucengData.equals(label)){
+            jcshcList.add(returnNode);
+        }else if(SchemaLayerObject.zhengheceng.equals(label) ||SchemaLayerObject.zhenghecengData.equals(label)){
+            zhshcList.add(returnNode);
+        }else if(SchemaLayerObject.tongjiceng.equals(label) ||SchemaLayerObject.tongjicengData.equals(label)){
+            tjshcList.add(returnNode);
+        }else if(SchemaLayerObject.fenxiceng.equals(label) ||SchemaLayerObject.fenxicengData.equals(label)){
+            fxshcList.add(returnNode);
+        }else if(SchemaLayerObject.jishiceng.equals(label) ||  SchemaLayerObject.jishicengData.equals(label)){
+            jsshcList.add(returnNode);
+        }else if(SchemaLayerObject.yingyongceng.equals(label) ||SchemaLayerObject.yingyongcengData.equals(label)){
+            yysjcList.add(returnNode);
+        }else {
+//                schemaMap.get("未分层").add(returnNode);
+        }
     }
 
     @Override