Commit 5f1e3cbb by qiuchaofei

1,添加接口,2修改关系名称为中文名。

parent 81447810
...@@ -119,6 +119,35 @@ public class MetaDataController { ...@@ -119,6 +119,35 @@ public class MetaDataController {
return metadataService.finAllMetaData(); return metadataService.finAllMetaData();
} }
/**
* 返回一个系统级的大图
*/
@ApiOperation(tags = "",value="系统级的大图")
@RequestMapping(path = "/getBigGraph", method = RequestMethod.GET)
public ReturnReslult getBigGraph(){
logger.info("开始获取系统级的大图");
ReturnReslult result = new ReturnReslult();
return result;
}
/**
* 传入一个节点与层数,返回指定节点的直接下层节点
*/
@ApiOperation(tags = "",value="开始获取直接下层节点")
@RequestMapping(path = "/getNextDrill", method = RequestMethod.GET)
public ReturnReslult getNextDrill(String dataId){
logger.info("开始获取直接下层节点");
ReturnReslult result = new ReturnReslult();
return result;
}
/** /**
* 修改图片的接口,传入元模型id,新图标 * 修改图片的接口,传入元模型id,新图标
......
...@@ -48,20 +48,20 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -48,20 +48,20 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
List<BaseRelationship> baseRelationshipList = new ArrayList<>(); List<BaseRelationship> baseRelationshipList = new ArrayList<>();
for(CompositionRelation compositionRelation:compositionRelationList ){ for(CompositionRelation compositionRelation:compositionRelationList ){
compositionRelation.setName("Composition"); compositionRelation.setName("组合");
baseRelationshipList.add(compositionRelation); baseRelationshipList.add(compositionRelation);
} }
for(InputRelation inputRelation:inputRelationList ){ for(InputRelation inputRelation:inputRelationList ){
inputRelation.setName("Input"); inputRelation.setName("流入");
baseRelationshipList.add(inputRelation); baseRelationshipList.add(inputRelation);
} }
for(OutputRelation outputRelation:outputRelationList ){ for(OutputRelation outputRelation:outputRelationList ){
outputRelation.setName("Output"); outputRelation.setName("流出");
baseRelationshipList.add(outputRelation); baseRelationshipList.add(outputRelation);
} }
for(ExecuteRelation executeRelation:executeRelationList ){ for(ExecuteRelation executeRelation:executeRelationList ){
executeRelation.setName("Execute"); executeRelation.setName("执行");
baseRelationshipList.add(executeRelation); baseRelationshipList.add(executeRelation);
} }
......
...@@ -157,7 +157,9 @@ public class MetadataServiceImpl implements IMetadataService { ...@@ -157,7 +157,9 @@ public class MetadataServiceImpl implements IMetadataService {
public void syschroRelationFromMongo(String catalogName) { public void syschroRelationFromMongo(String catalogName) {
//先从mongo读取关系,写入neo4j //先从mongo读取关系,写入neo4j
Map<String ,MetaData> metaDataMap = new HashMap<>(); Map<String ,MetaData> metaDataMap = new HashMap<>();
logger.info("开始从mongo获取数据。");
List<RelationMongo> relationMongoList = mongoDbServiceImpl.findAll(catalogName); List<RelationMongo> relationMongoList = mongoDbServiceImpl.findAll(catalogName);
logger.info("mongo获取数据完成。");
for(RelationMongo relationMongo:relationMongoList){ for(RelationMongo relationMongo:relationMongoList){
// 获取元数据属性 // 获取元数据属性
// System.out.println(relationMongo.getId()); // System.out.println(relationMongo.getId());
...@@ -169,16 +171,18 @@ public class MetadataServiceImpl implements IMetadataService { ...@@ -169,16 +171,18 @@ public class MetadataServiceImpl implements IMetadataService {
if(!metaDataMap.containsKey(sourceId)){ if(!metaDataMap.containsKey(sourceId)){
//不存在源 //不存在源
MetaData metaData = new MetaData();
metaData.setMetadataId(sourceId);
Map<String, Object> attriuteMap = metadataRepoRemoteService.getMetadata(sourceId); Map<String, Object> attriuteMap = metadataRepoRemoteService.getMetadata(sourceId);
if(attriuteMap==null){ if(attriuteMap==null){
logger.info("没有找到id:"+sourceId+"的元数据。");
continue; continue;
} }
String name = (String) attriuteMap.get("name"); String name = (String) attriuteMap.get("name");
if(attriuteMap.get("cnName")!=null && !attriuteMap.get("cnName").equals("")){ if(attriuteMap.get("cnName")!=null && !attriuteMap.get("cnName").equals("")){
name = (String) attriuteMap.get("cnName"); name = (String) attriuteMap.get("cnName");
} }
MetaData metaData = new MetaData();
metaData.setMetadataId(sourceId);
metaData.setName(name); metaData.setName(name);
metaDataMap.put(sourceId,metaData); metaDataMap.put(sourceId,metaData);
MetaData metadata = metadataRepository.findMetadataByName(name); MetaData metadata = metadataRepository.findMetadataByName(name);
...@@ -187,10 +191,11 @@ public class MetadataServiceImpl implements IMetadataService { ...@@ -187,10 +191,11 @@ public class MetadataServiceImpl implements IMetadataService {
}else{ }else{
metadataRepository.save(metaData); metadataRepository.save(metaData);
} }
//如果是字段级的,需要上升查找父节点
if(sourceId.startsWith("Column=") || sourceId.startsWith("Header=") ){ if(sourceId.startsWith("Column=") || sourceId.startsWith("Header=") ){
Map<String, Object> parentAlttriuteMap = metadataRepoRemoteService.getParent(sourceId); Map<String, Object> parentAlttriuteMap = metadataRepoRemoteService.getParent(sourceId);
if(parentAlttriuteMap ==null){ if(parentAlttriuteMap ==null){
logger.info("没有找到id:"+sourceId+"的父节点元数据。");
continue; continue;
} }
String parentId = (String) parentAlttriuteMap.get("_id"); String parentId = (String) parentAlttriuteMap.get("_id");
...@@ -222,6 +227,10 @@ public class MetadataServiceImpl implements IMetadataService { ...@@ -222,6 +227,10 @@ public class MetadataServiceImpl implements IMetadataService {
MetaData metaData = new MetaData(); MetaData metaData = new MetaData();
metaData.setMetadataId(targetId); metaData.setMetadataId(targetId);
Map<String, Object> attriuteMap = metadataRepoRemoteService.getMetadata(targetId); Map<String, Object> attriuteMap = metadataRepoRemoteService.getMetadata(targetId);
if(attriuteMap == null){
logger.info("没有找到id:"+targetId+"的元数据。");
continue;
}
String name = (String) attriuteMap.get("name"); String name = (String) attriuteMap.get("name");
if(attriuteMap.get("cnName")!=null && !attriuteMap.get("cnName").equals("")){ if(attriuteMap.get("cnName")!=null && !attriuteMap.get("cnName").equals("")){
...@@ -239,6 +248,12 @@ public class MetadataServiceImpl implements IMetadataService { ...@@ -239,6 +248,12 @@ public class MetadataServiceImpl implements IMetadataService {
} }
if(targetId.startsWith("Column=") || targetId.startsWith("Header=") ){ if(targetId.startsWith("Column=") || targetId.startsWith("Header=") ){
Map<String, Object> parentAlttriuteMap = metadataRepoRemoteService.getParent(targetId); Map<String, Object> parentAlttriuteMap = metadataRepoRemoteService.getParent(targetId);
if(parentAlttriuteMap ==null){
logger.info("没有找到id:"+targetId+"的父节点元数据。");
continue;
}
String parentId = (String) parentAlttriuteMap.get("_id"); String parentId = (String) parentAlttriuteMap.get("_id");
if(!metaDataMap.containsKey(parentId)){ if(!metaDataMap.containsKey(parentId)){
......
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