Commit 5694d584 by qiuchaofei

1.添加帅选多种节点的接口,2修复按名称查询时缺少关系的问题。

parent 88a95721
......@@ -19,6 +19,7 @@ import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnReslult;
import com.keymobile.metadata.metadataRelation.service.AsyncDataFromMongoToNeo4j;
import com.keymobile.metadata.metadataRelation.service.IBaseRelationshipService;
import com.keymobile.metadata.metadataRelation.service.IMetadataService;
import com.keymobile.metadata.metadataRelation.service.MultiModelService;
import com.keymobile.metadata.metadataRelation.service.impl.MongoDbServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -29,6 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -52,6 +54,8 @@ public class MetaDataController {
@Autowired
private IBaseRelationshipService baseRelationshipService;
@Autowired
private MultiModelService multiModelService;
/**
* 获取所有的节点
*/
......@@ -132,6 +136,16 @@ public class MetaDataController {
}
@ApiOperation(tags = "", value = "系统级的大图")
public ReturnReslult getBigGraphByMultiModel(String modelName0,String size) {
String[] models = modelName0.split(",");
List<String> modelNameList = new ArrayList<>();
for(String modelName:models){
modelNameList.add(modelName);
}
ReturnReslult resultByModelNameList = multiModelService.findResultByModelNameList(modelNameList, 300);
return resultByModelNameList;
}
/**
* 返回一个系统级的大图
......@@ -147,7 +161,15 @@ public class MetaDataController {
if (modelName0 == null || modelName0.equals("")) {
modelName0 = "Table";
}
if(modelName0.toLowerCase().equals("system")){
if(modelName0.contains(",")){
String[] models = modelName0.split(",");
List<String> modelNameList = new ArrayList<>();
for(String modelName:models){
modelNameList.add(modelName);
}
returnReslult = multiModelService.findResultByModelNameList(modelNameList, sizeInt);
}
else if(modelName0.toLowerCase().equals("system")){
returnReslult = metadataService.getSystemGraph(sizeInt);
}else if( !modelName0.toLowerCase().equals("all")){
returnReslult = metadataService.findResultByModelName(modelName0,sizeInt);
......
package com.keymobile.metadata.metadataRelation.service;
import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnReslult;
import java.util.List;
public interface MultiModelService {
ReturnReslult findResultByModelNameList(List<String> modelNameList, int count );
}
......@@ -787,8 +787,10 @@ public class MetadataServiceImpl implements IMetadataService {
edge.setEdgeId(returnNode.getId()+"_"+childId);
edge.setFromId(returnNode.getId());
edge.setToId(childId);
childId = returnNode.getId();
edge.setType("组合");
returnReslult.getEdges().add(edge);
}else if(value.type().name().equals("INTEGER")) {
}
......@@ -981,7 +983,7 @@ public class MetadataServiceImpl implements IMetadataService {
}
}
for(Object obj : edgeMap.keySet()){
Edge edge = (Edge) edgeMap.get(obj);
Edge edge = edgeMap.get(obj);
returnReslult.getEdges().add(edge);
}
......@@ -1099,6 +1101,8 @@ public class MetadataServiceImpl implements IMetadataService {
String metadataName = metadataNameList[metadataNameList.length-1];
cypher = "match (n:softplatform{name:\""+metadataName+"\"}) -[r]->(m:softplatform) return r,n,m";
}else {
logger.info("该类型不支持搜索。");
}
StatementResult result1 = session. run(cypher);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment