1,添加系统总图的接口，2修改关系类型的接口

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

@@ -226,6 +226,15 @@ public class MetaDataController {
         return returnReslult;
     }
 
+
+    @ApiOperation(tags = "", value = "系统总图")
+    @RequestMapping(path = "/getSystemGraph", method = RequestMethod.GET)
+    public ReturnReslult getSystemGraph(){
+        return metadataService.getSystemGraph();
+
+    }
+
+
     private String getParentId(String neo4jId, Map<String, String> child2Parent) {
         String parentId = neo4jId;
         while (child2Parent.containsKey(neo4jId)) {

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

@@ -15,6 +15,8 @@ public interface IMetadataService {
 
     ReturnReslult findResultByModelName(String modelName);
 
+    ReturnReslult getSystemGraph();
+
     List<MetaData> findChildrenByParentId(String parentId);
 
     List<MetaData> findChildrenByParentName(String parentName);

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

@@ -76,7 +76,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
         Neo4jConfig neo4jConfig = new Neo4jConfig();
         Driver neo4jConnection = neo4jConfig.getNeo4jConnection();
         Session session = neo4jConnection.session();
-        String cypher = " MATCH (n:MetaData)-[r]->() RETURN id(STARTNODE(r)) as startId,id(endNode(r)) as endId, type(r) as name";
+        String cypher = " MATCH (n)-[r]->() RETURN id(STARTNODE(r)) as startId,id(endNode(r)) as endId, type(r) as name";
         logger.info("cypher:" + cypher);
         StatementResult result = session.run(cypher);
 

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

@@ -333,6 +333,106 @@ public class MetadataServiceImpl implements IMetadataService {
         return returnReslult;
     }
 
+    @Override
+    public ReturnReslult getSystemGraph() {
+
+        ReturnReslult returnReslult = new ReturnReslult();
+
+
+        Neo4jConfig neo4jConfig = new Neo4jConfig();
+        Driver neo4jConnection = neo4jConfig.getNeo4jConnection();
+        Session session = neo4jConnection.session();
+//        match (n:MetaData ) where n.metadataId =~"Table=.*" return n
+        String cypher = "match data=(na:softplatform)-[r]->(nb:softplatform) return data";
+        logger.info("cypher:" + cypher);
+
+        Map<String, MetaModel> metaModelMap = new HashMap<>();
+        long starttime = System.currentTimeMillis();
+        StatementResult result = session.run(cypher);
+        long endtime = System.currentTimeMillis();
+        logger.info("查询耗时："+(endtime-starttime));
+        String modelName = "System";
+        List<String> metadataIdList = new ArrayList<>();
+        while (result.hasNext()) {
+            Record record = result.next();
+            List<Value> values = record.values();
+            for (Value value : values) {
+                if (value.type().name().equals("PATH")) {
+                    Path p = value.asPath();
+                    Iterable<Node> nodes = p.nodes();
+                    Map<Long, MetaData> nodesMap = new HashMap<>();
+                    for (Node node : nodes) {
+                        Map<String, Object> stringObjectMap = node.asMap();
+
+                        MetaData metaData = new MetaData();
+                        Neo4jTool.transMap2Bean(stringObjectMap, metaData);
+//                        metaDataList.add(data);
+                        if(metaData.getMetadataId() == null ){
+                            metaData.setMetadataId("System="+metaData.getName());
+                        }
+                        com.keymobile.metadata.metadataRelation.pojo.returnBean.Node returnNode = new com.keymobile.metadata.metadataRelation.pojo.returnBean.Node();
+                        returnNode.setId(metaData.getMetadataId());
+                        returnNode.setName(metaData.getName());
+
+                        String[] strings = metaData.getMetadataId().split("=");
+                        returnNode.setIcon(modelName);
+                        if (!metaModelMap.containsKey(modelName)) {
+                            MetaModel model = new MetaModel();
+                            String iconContext = getIconByModelId(modelName);
+                            model.setModelName(modelName);
+                            model.setCnName(modelName);
+                            model.setDescription("");
+                            model.setIcon(iconContext);
+                            metaModelMap.put(modelName, model);
+                        }
+                        returnNode.setType("MetaData");
+                        returnReslult.getNodes().add(returnNode);
+                        nodesMap.put(node.id(), metaData);
+                    }
+                    Iterable<Relationship> relationships = p.relationships();
+                    for (Relationship relationship : relationships) {
+
+                        Long startID = relationship.startNodeId();
+                        Long endID = relationship.endNodeId();
+                        String rType = relationship.type();
+                        /**
+                         * asMap 相当于 节点的properties属性信息
+                         */
+//                        relationship.id();
+//
+                        Edge edge = new Edge();
+                        String relationName =
+                                nodesMap.get(startID).getMetadataId() + "-" + rType + "-"
+                                        + nodesMap.get(endID).getMetadataId();
+
+                        edge.setEdgeId(String.valueOf(relationship.id()));
+
+                        String startMetaId = "";
+                        String endMEtaId = "";
+                        if (nodesMap.containsKey(startID)) {
+                            startMetaId = nodesMap.get(startID).getMetadataId();
+                        }
+
+                        if (nodesMap.containsKey(endID)) {
+                            endMEtaId = nodesMap.get(endID).getMetadataId();
+                        }
+                        edge.setFromId(startMetaId);
+                        edge.setToId(endMEtaId);
+                        edge.setType(rType);
+
+                        returnReslult.getEdges().add(edge);
+                    }
+                }
+
+            }
+        }
+
+
+        returnReslult.setMetaModelMap(metaModelMap);
+        return returnReslult;
+
+    }
+
     public String getIconByModelId(String modelId) {
         ApplicationHome applicationHome = new ApplicationHome(getClass());
         File jarFile = applicationHome.getSource();
@@ -621,10 +721,10 @@ public class MetadataServiceImpl implements IMetadataService {
 
     @Override
     public List<String> findAllNodeTypes() {
-
         Iterable<MetaData> dataIterable = metadataRepository.findAll();
         List<String> labels = new ArrayList<>();
         labels.add("All");
+        labels.add("System");
         for(MetaData data :dataIterable){
             String metadataId = data.getMetadataId();
             String[] metadataIds = metadataId.split("=");
@@ -634,6 +734,17 @@ public class MetadataServiceImpl implements IMetadataService {
             }
         }
 
+        Iterable<TempNode> nodeIterable = tempNodeRepository.findAll();
+        labels.add("All");
+        for(TempNode node :nodeIterable){
+            String metadataId = node.getMetadataId();
+            String[] metadataIds = metadataId.split("=");
+            String modelName = metadataIds[0];
+            if(!labels.contains(modelName)){
+                labels.add(modelName);
+            }
+        }
+
         return labels;
     }