1,同步数据时，添加日志，2 关系分析的入口是job，script时，返回当前点。

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

@@ -19,7 +19,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import java.awt.image.renderable.RenderableImageOp;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

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

@@ -1379,11 +1379,14 @@ public class MetadataServiceImpl implements IMetadataService {
                         Neo4jSystem neo4jSystem = null;
                         List<String> systemIdList = dataBaseData.getSysList();
                         for(String systemId:systemIdList){
+                            //系统id
+                            logger.info("系统ID："+systemId);
                             if(systemDataMap.containsKey(systemId)){
                                 neo4jSystem = systemDataMap.get(systemId);
+                                break;
                             }
                         }
-
+                        logger.info("获取的系统是:"+neo4jSystem);
                         Neo4jETLJob neo4jETLJob = new Neo4jETLJob();
                         neo4jETLJob.setMetadataId(etlJobData.get_id());
                         neo4jETLJob.setName(etlJobData.getName());
@@ -1489,11 +1492,23 @@ public class MetadataServiceImpl implements IMetadataService {
 
                         Neo4jSystem neo4jSystem = null;
                         List<String> systemIdList = dataBaseData.getSysList();
+
+                        for(Object obj :systemDataMap.keySet()){
+                            logger.info("systemId："+obj+" systemName:"+systemDataMap.get(obj).getName());
+                        }
+                        logger.info("schema："+schemaData.getName());
                         for(String systemId:systemIdList){
+                            //系统id
+                            logger.info("systemId："+systemId);
+                            logger.info("systemDataMap："+systemDataMap.keySet());
+                            logger.info("systemDataMap："+systemDataMap);
                             if(systemDataMap.containsKey(systemId)){
                                 neo4jSystem = systemDataMap.get(systemId);
+                                logger.info("获取的系统是:"+neo4jSystem.getName());
+                                break;
                             }
                         }
+
                         String schemaPath = neo4jSystem.getDataPath()+";"+schemaData.getName();
                         if(shemaIdAndLabel.get(schemaData_id)!=null){
                             neo4jSchema.setLabel(shemaIdAndLabel.get(schemaData_id));

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

@@ -3,17 +3,12 @@ package com.keymobile.metadata.metadataRelation.service.impl;
 import com.keymobile.metadata.metadataRelation.config.Neo4jConfig;
 import com.keymobile.metadata.metadataRelation.pojo.BaseNode;
 import com.keymobile.metadata.metadataRelation.pojo.MetaData;
-import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jColumn;
-import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jSchema;
-import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jSystem;
-import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jTable;
+import com.keymobile.metadata.metadataRelation.pojo.metadata.*;
 import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnNode;
 import com.keymobile.metadata.metadataRelation.remote.DataAssertRemoteService;
 import com.keymobile.metadata.metadataRelation.remote.DataStandardRemoteService;
 import com.keymobile.metadata.metadataRelation.remote.MetadataRepoRemoteService;
-import com.keymobile.metadata.metadataRelation.respository.metadata.Neo4jSchemaRepository;
-import com.keymobile.metadata.metadataRelation.respository.metadata.Neo4jSystemRepository;
-import com.keymobile.metadata.metadataRelation.respository.metadata.Neo4jTableRepository;
+import com.keymobile.metadata.metadataRelation.respository.metadata.*;
 import com.keymobile.metadata.metadataRelation.service.ITableService;
 import com.keymobile.metadata.metadataRelation.util.Neo4jTool;
 import org.neo4j.driver.v1.*;
@@ -34,6 +29,11 @@ public class TableServiceImpl implements ITableService {
     private Neo4jTableRepository neo4jTableRepository;
 
     @Autowired
+    private Neo4jETLJobRepository neo4jETLJobRepository;
+
+    @Autowired
+    private Neo4jETLScriptRepository neo4jETLScriptRepository;
+    @Autowired
     private DataStandardRemoteService dataStandardRemoteService;
 
     @Autowired
@@ -129,17 +129,38 @@ public class TableServiceImpl implements ITableService {
     }
 
     private List<ReturnNode> getCurrentTableInfo(String tableId) {
-        Neo4jTable neo4jTable = neo4jTableRepository.findNeo4jTableByMetadataId(tableId);
         List<ReturnNode> returnTableList = new ArrayList<>();
-        ReturnNode returnNode = new ReturnNode();
-        returnNode.setId(neo4jTable.getMetadataId());
-        returnNode.setName(neo4jTable.getName());
-        returnNode.setType("Table");
-        returnTableList.add(returnNode);
+
+        if(tableId.startsWith("Table=")){
+            Neo4jTable neo4jTable = neo4jTableRepository.findNeo4jTableByMetadataId(tableId);
+            ReturnNode returnNode = new ReturnNode();
+            returnNode.setId(neo4jTable.getMetadataId());
+            returnNode.setName(neo4jTable.getName());
+            returnNode.setType("Table");
+
 //                获取属性
-        Map<String,String> attributeMap =  getAttributeMap(tableId);
+            Map<String,String> attributeMap =  getAttributeMap(tableId);
+            returnNode.setAttributeMaps(attributeMap);
+            returnTableList.add(returnNode);
+        }else if(tableId.startsWith("ETLJob=")){
+            Neo4jETLJob neo4jETLJob  = neo4jETLJobRepository.findNeo4jETLJobByMetadataId(tableId);
+            ReturnNode returnNode = new ReturnNode();
+            returnNode.setId(neo4jETLJob.getMetadataId());
+            returnNode.setName(neo4jETLJob.getName());
+            returnNode.setType("Neo4jETLJob");
+
+//
+            returnTableList.add(returnNode);
+        }else if(tableId.startsWith("ETLScript=")){
+            Neo4jETLScript neo4jETLScript = neo4jETLScriptRepository.findNeo4jETLScriptByMetadataId(tableId);
+            ReturnNode returnNode = new ReturnNode();
+            returnNode.setId(neo4jETLScript.getMetadataId());
+            returnNode.setName(neo4jETLScript.getName());
+            returnNode.setType("Neo4jETLScript");
+
+            returnTableList.add(returnNode);
+        }
 
-        returnNode.setAttributeMaps(attributeMap);
         return returnTableList;
     }