修改过滤关系的算法1

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

@@ -324,6 +324,34 @@ public class MetadataRelationServiceImpl implements IMetadataRelationService {
         ReturnReslult returnReslult = new ReturnReslult();
         Map<String,List<JSONObject>> nodeMap = JSONObject.fromObject(reulstJson);
 
+        List<JSONObject> nodeObjectList = nodeMap.get("nodes");
+        List<JSONObject> edgeObjectList = nodeMap.get("edges");
+        if(nodeObjectList!=null){
+            for(JSONObject nodeObject:nodeObjectList){
+                String metadataId = (String) nodeObject.get("id");
+                ReturnNode returnNode = new ReturnNode();
+                returnNode.setId(metadataId);
+                returnReslult.getNodes().add(returnNode);
+            }
+
+        }
+        if(nodeObjectList!=null){
+            for(JSONObject edgeObject:edgeObjectList){
+                String sourceId = (String) edgeObject.get("fromId");
+                String targetId = (String) edgeObject.get("toId");
+
+                ReturnEdge edge = new ReturnEdge();
+
+                edge.setFromId(sourceId);
+                edge.setToId(targetId);
+                edge.setEdgeId(sourceId+"_"+targetId);
+                returnReslult.getEdges().add(edge);
+            }
+
+        }
+
+
+
         String currentNodeId = "";
         List<JSONObject> currentObjectList = nodeMap.get("当前表");
         if(currentObjectList!=null){
@@ -337,37 +365,43 @@ public class MetadataRelationServiceImpl implements IMetadataRelationService {
         }
 
         List<JSONObject> sourceObjectList = nodeMap.get("来源");
-        for(JSONObject sourceNode:sourceObjectList){
-            ReturnEdge edge = new ReturnEdge();
-            String sourceId = (String) sourceNode.get("id");
-            edge.setFromId(sourceId);
-            edge.setToId(currentNodeId);
-            edge.setEdgeId(sourceId+"_"+currentNodeId);
-            returnReslult.getEdges().add(edge);
+        if(sourceObjectList !=null){
+            for(JSONObject sourceNode:sourceObjectList){
+                ReturnEdge edge = new ReturnEdge();
+                String sourceId = (String) sourceNode.get("id");
+                edge.setFromId(sourceId);
+                edge.setToId(currentNodeId);
+                edge.setEdgeId(sourceId+"_"+currentNodeId);
+                returnReslult.getEdges().add(edge);
 
-            ReturnNode returnNode = new ReturnNode();
-            returnNode.setId(sourceId);
-            returnNode.setName((String) sourceNode.get("name"));
-            returnReslult.getNodes().add(returnNode);
+                ReturnNode returnNode = new ReturnNode();
+                returnNode.setId(sourceId);
+                returnNode.setName((String) sourceNode.get("name"));
+                returnReslult.getNodes().add(returnNode);
 
+            }
         }
 
+
         List<JSONObject> targetObjectList = nodeMap.get("目标");
-        for(JSONObject targetObject:targetObjectList){
-            ReturnEdge edge = new ReturnEdge();
-            String targetId = (String) targetObject.get("id");
-            edge.setFromId(currentNodeId);
-            edge.setToId(targetId );
-            edge.setEdgeId(currentNodeId+"_"+targetId );
-            returnReslult.getEdges().add(edge);
+        if(targetObjectList!=null){
+            for(JSONObject targetObject:targetObjectList){
+                ReturnEdge edge = new ReturnEdge();
+                String targetId = (String) targetObject.get("id");
+                edge.setFromId(currentNodeId);
+                edge.setToId(targetId );
+                edge.setEdgeId(currentNodeId+"_"+targetId );
+                returnReslult.getEdges().add(edge);
 
-            ReturnNode returnNode = new ReturnNode();
-            returnNode.setId(targetId);
-            returnNode.setName((String) targetObject.get("name"));
-            returnReslult.getNodes().add(returnNode);
+                ReturnNode returnNode = new ReturnNode();
+                returnNode.setId(targetId);
+                returnNode.setName((String) targetObject.get("name"));
+                returnReslult.getNodes().add(returnNode);
 
+            }
         }
 
+
         return returnReslult;
     }
 }

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

@@ -97,7 +97,7 @@ public class TableServiceImpl implements ITableService {
         List<ReturnNode> standardList = new ArrayList<>();
         Map<String,Object> maps = new HashMap<>();
         maps.put("parentMetadataId",tableId);
-
+        logger.info("调用标准接口，参数是parentMetadataId:"+tableId);
         try{
             Map<String, Object> standardMaps = dataStandardRemoteService.findStandardByMetadatId(1, 10,
                     maps);