修改TempNode创建

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

@@ -550,6 +550,7 @@ public class MetaDataController {
         logger.info("开始同步元数据：从mongo到neo4j");
         String flag = "success";
         metadataService.syschroRelationFromMongo(catalogName);
+        metadataService.deleteTempNodeByCatalogName(catalogName);
         metadataService.createTempNode(catalogName);
         return flag;
     }
@@ -560,8 +561,8 @@ public class MetaDataController {
     }
 
     @PostMapping("/removeTempRelation")
-    public void removeTempRelation(@RequestParam String sqlId, @RequestParam String catalogName) {
-        mongoDbService.removeTempRelation(sqlId, catalogName);
+    public void removeTempRelation(@RequestParam String etlScriptId, @RequestParam String catalogName) {
+        mongoDbService.removeTempRelation(etlScriptId, catalogName);
     }
 
     @PostMapping("/createTempNode")
@@ -570,8 +571,8 @@ public class MetaDataController {
     }
 
     @PostMapping("/deleteTempNode")
-    public void deleteTempNode(@RequestParam String sqlId) {
-        metadataService.deleteTempNode(sqlId);
+    public void deleteTempNode(@RequestParam String catalogName) {
+        metadataService.deleteTempNodeByCatalogName(catalogName);
     }
 
 

src/main/java/com/keymobile/metadata/metadataRelation/pojo/TempNode.java

@@ -10,16 +10,46 @@ import org.neo4j.ogm.annotation.NodeEntity;
 @NodeEntity(label = "TempNode")
 public class TempNode extends BaseNode {
 
-    private String sqlId;
-
     private String metadataId;
 
-    public String getSqlId() {
-        return sqlId;
+    private String etlScriptId;
+
+    private String etlJobId;
+
+    private String catalogName;
+
+    private  Long parentId;
+
+    public String getEtlScriptId() {
+        return etlScriptId;
+    }
+
+    public void setEtlScriptId(String etlScriptId) {
+        this.etlScriptId = etlScriptId;
+    }
+
+    public String getEtlJobId() {
+        return etlJobId;
+    }
+
+    public void setEtlJobId(String etlJobId) {
+        this.etlJobId = etlJobId;
+    }
+
+    public String getCatalogName() {
+        return catalogName;
+    }
+
+    public void setCatalogName(String catalogName) {
+        this.catalogName = catalogName;
+    }
+
+    public Long getParentId() {
+        return parentId;
     }
 
-    public void setSqlId(String sqlId) {
-        this.sqlId = sqlId;
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
     }
 
     public String getMetadataId() {

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

 package com.keymobile.metadata.metadataRelation.respository;
 
+import java.util.List;
+
 import com.keymobile.metadata.metadataRelation.pojo.TempNode;
 import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
@@ -12,8 +14,14 @@ import org.springframework.data.repository.query.Param;
  */
 public interface TempNodeRepository extends Neo4jRepository<TempNode, Long> {
 
-    Long deleteTempNodesBySqlId(String sqlId);
+    Long deleteTempNodesByEtlScriptId(String etlScriptId);
+
+    Long deleteTempNodesByEtlJobId(String etlJobId);
+
+    Long deleteTempNodesByCatalogName(String catalogName);
+
+    @Query("match (source:BaseNode)-[r]-(target:BaseNode) where source.catalogName=$catalogName or target.catalogName=$catalogName delete r")
+    Long deleteAllRelation(@Param("catalogName") String catalogName);
 
-    @Query("match (source:BaseNode)-[r]-(target:BaseNode) where source.sqlId=$sqlId or target.sqlId=$sqlId delete r")
-    Long deleteAllRelation(@Param("sqlId") String sqlId);
+    List<TempNode> findByCatalogNameAndEtlJobIdAndParentIdAndName(String catalogName, String etlJobId, Long parentId, String name);
 }

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

@@ -4,7 +4,6 @@ import com.keymobile.metadata.metadataRelation.pojo.BaseRelationship;
 import com.keymobile.metadata.metadataRelation.pojo.MetaData;
 import com.keymobile.metadata.metadataRelation.pojo.TempNode;
 import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnReslult;
-import org.springframework.data.mongodb.core.query.Meta;
 
 import java.util.List;
 
@@ -73,7 +72,7 @@ public interface IMetadataService {
 
     void createTempNode(String catalogName);
 
-    void deleteTempNode(String sqlId);
+    void deleteTempNodeByCatalogName(String catalogName);
 
     List<TempNode> findAllTempNode();
 }

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

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -404,27 +405,38 @@ public class MetadataServiceImpl implements IMetadataService {
         return  labels;
     }
 
-    private Long createNode(Map<String, Long> nameIdMap, String sqlId, String name, boolean isTable) {
-        Long nodeId = nameIdMap.get(name);
+    private Long createNode(Map<String, Long> nameIdMap, String catalogName, String etlJobId, String etlScriptId, String name, boolean isTable, Long parentId) {
+        String identifier = String.format("%s,%s,%s", etlJobId, parentId, name);
+        Long nodeId = nameIdMap.get(identifier);
         if (nodeId == null) {
             String[] split = StringUtils.split(name, '.');
             if (split.length == 2) {
                 String tableName = split[0];
                 String columnName = split[1];
-                Long tableId = createNode(nameIdMap, sqlId, tableName, true);
-                nodeId = createNode(nameIdMap, sqlId, columnName, false);
+                Long tableId = createNode(nameIdMap, catalogName, etlJobId, etlScriptId, tableName,  true, null);
+                nodeId = createNode(nameIdMap, catalogName, etlJobId, etlScriptId, columnName, false, tableId);
                 if (tableId != null && nodeId != null) {
                     compositionRelationRespository.mergeConpositionRelation(tableId, nodeId);
                 }
             } else {
-                TempNode tempNode = new TempNode();
-                String modelName = isTable ? "TempTable" : "TempColumn";
-                tempNode.setMetadataId(modelName + "=" + UUID.randomUUID());
-                tempNode.setName(name);
-                tempNode.setSqlId(sqlId);
+                TempNode tempNode;
+                List<TempNode> list = tempNodeRepository.findByCatalogNameAndEtlJobIdAndParentIdAndName(catalogName, etlJobId, parentId, name);
+                if (!CollectionUtils.isEmpty(list)) {
+                    tempNode = list.get(0);
+                } else {
+                    tempNode = new TempNode();
+                    String modelName = isTable ? "TempTable" : "TempColumn";
+                    tempNode.setMetadataId(modelName + "=" + UUID.randomUUID());
+                    tempNode.setCatalogName(catalogName);
+                    tempNode.setEtlJobId(etlJobId);
+                    tempNode.setEtlScriptId(etlScriptId);
+                    tempNode.setName(name);
+                }
+                tempNode.setParentId(parentId);
                 tempNode = tempNodeRepository.save(tempNode);
                 nodeId = tempNode.getId();
-                nameIdMap.put(name, nodeId);
+                nameIdMap.put(identifier, nodeId);
+
             }
         }
         return nodeId;
@@ -434,23 +446,21 @@ public class MetadataServiceImpl implements IMetadataService {
     public void createTempNode(String catalogName) {
         int page = 0, pageSize = 500;
         long totalElement = mongoDbServiceImpl.countTempRelation(PageRequest.of(page, pageSize), catalogName);
-        Map<String, Long> sqlIdNodeIdMap = new HashMap<>();
         Map<String, Long> nameIdMap = new HashMap<>();
         for (; page < totalElement; page += pageSize) {
-            List<JSONObject> list = mongoDbServiceImpl.findTempRelationByPage(PageRequest.of(page, pageSize, Sort.by("sqlId")), catalogName);
+            List<JSONObject> list = mongoDbServiceImpl.findTempRelationByPage(PageRequest.of(page, pageSize, Sort.by("etlJobId")), catalogName);
             for (JSONObject relation : list) {
-                String sqlId = relation.getString("sqlId");
-                deleteTempNode(sqlId);
+                String sqlId = relation.getString("etlSqlId");
+                String etlScriptId = relation.getString("etlScriptId");
+                String etlJobId = relation.getString("etlJobId");
+                deleteTempNodeByCatalogName(sqlId);
                 MetaData metadata = metadataRepository.findMetaDataByMetadataId(sqlId);
                 if (metadata == null) {
                     logger.error("id : {} is not found", sqlId);
                     continue;
                 }
                 Long id = metadata.getId();
-                if (!sqlIdNodeIdMap.containsKey(sqlId)) {
-                    sqlIdNodeIdMap.put(sqlId, id);
-                    nameIdMap = new HashMap<>();
-                }
+
                 String source = relation.getString("source");
                 String target = relation.getString("target");
                 if (StringUtils.isBlank(source) || StringUtils.isBlank(target)) {
@@ -459,13 +469,13 @@ public class MetadataServiceImpl implements IMetadataService {
 
                 String type = relation.getString("type");
                 if ("Input".equalsIgnoreCase(type)) {
-                    Long nodeId = createNode(nameIdMap, sqlId, source, false);
+                    Long nodeId = createNode(nameIdMap, catalogName, etlJobId, etlScriptId, source, false, null);
                     if (nodeId != null) {
                         inputRelationReRepository.mergeInputRelation(nodeId, id);
                     }
                 }
                 if ("Output".equalsIgnoreCase(type)) {
-                    Long nodeId = createNode(nameIdMap, sqlId, target, false);
+                    Long nodeId = createNode(nameIdMap, catalogName, etlJobId, etlScriptId, target, false, null);
                     if (nodeId != null) {
                         outputRelationRepository.mergeOutRelation(id, nodeId);
                     }
@@ -475,9 +485,9 @@ public class MetadataServiceImpl implements IMetadataService {
     }
 
     @Override
-    public void deleteTempNode(String sqlId) {
-        tempNodeRepository.deleteAllRelation(sqlId);
-        tempNodeRepository.deleteTempNodesBySqlId(sqlId);
+    public void deleteTempNodeByCatalogName(String catalogName) {
+        tempNodeRepository.deleteAllRelation(catalogName);
+        tempNodeRepository.deleteTempNodesByCatalogName(catalogName);
     }
 
     @Override

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

@@ -60,8 +60,8 @@ public class MongoDbServiceImpl {
         list.forEach(o -> mongoTemplate.save(o, PREFIX_MD_RELATION_TEMP_NODE + catalogName));
     }
 
-    public void removeTempRelation(String sqlId, String catalogName) {
-        Query query = Query.query(Criteria.where("sqlId").is(sqlId));
+    public void removeTempRelation(String etlScriptId, String catalogName) {
+        Query query = Query.query(Criteria.where("etlScriptId").is(etlScriptId));
         mongoTemplate.remove(query, PREFIX_MD_RELATION_TEMP_NODE + catalogName);
     }