Commit 760f0cce by qiuchaofei

1,默认的关系描述是0,2查找表的字段的接口

parent f909c3cf
......@@ -42,7 +42,7 @@ public class ColumnServiceImpl implements IColumnService {
targetNodeList.add(targetBaseNode);
}else if(targetBaseNode.getMetadataId().startsWith("ETLSql=")){
getTargetRelationAboutColumns(targetBaseNode.getMetadataId(),targetNodeList);
//不是,就继续找
//不是字段,就继续找
}
}
......@@ -69,7 +69,7 @@ public class ColumnServiceImpl implements IColumnService {
sourceNodeList.add(sourceBaseNode);
}else if(sourceBaseNode.getMetadataId().startsWith("ETLSql=")){
getSourceRelationAboutColumns(sourceBaseNode.getMetadataId(),sourceNodeList);
//不是,就继续找
//不是字段,就继续找
}
}
......@@ -100,21 +100,19 @@ public class ColumnServiceImpl implements IColumnService {
}
private void getSourceRelationAboutColumns(String metadataId, List<BaseNode> sourceReturnNodeList) {
{
List<BaseNode> sourceNodeList = new ArrayList<>();
if(metadataId.startsWith("ETLSql=")){
sourceNodeList = neo4jColumnRepository.getSourceColumn(metadataId);
}else if(metadataId.startsWith("File=")){
List<BaseNode> sourceNodeList = new ArrayList<>();
if(metadataId.startsWith("ETLSql=")){
sourceNodeList = neo4jColumnRepository.getSourceColumn(metadataId);
}else if(metadataId.startsWith("File=")){
// targetNodeList = neo4jFileRepository.getTargets(metadataId);
}
for(BaseNode sourceNode:sourceNodeList){
if(sourceNode.getMetadataId().startsWith("Column=")){
//是表
sourceReturnNodeList.add(sourceNode);
}else if(sourceNode.getMetadataId().startsWith("ETLSql=")){
getSourceRelationAboutColumns(sourceNode.getMetadataId(),sourceReturnNodeList);
//不是表,就继续找
}
}
for(BaseNode sourceNode:sourceNodeList){
if(sourceNode.getMetadataId().startsWith("Column=")){
//是表
sourceReturnNodeList.add(sourceNode);
}else if(sourceNode.getMetadataId().startsWith("ETLSql=")){
getSourceRelationAboutColumns(sourceNode.getMetadataId(),sourceReturnNodeList);
//不是表,就继续找
}
}
}
......
......@@ -1877,6 +1877,9 @@ public class MetadataServiceImpl implements IMetadataService {
String jobId = relation.getString("jobId");
attributeMap.put("jobId",jobId);
String description = relation.getString("description");
if(description==null){
description = "0";
}
attributeMap.put("description",description);
String type = relation.getString("type");
if(!(type.equals("Input") || type.equals("Output"))){
......
......@@ -520,7 +520,11 @@ public class TableServiceImpl implements ITableService {
long endtime = System.currentTimeMillis();
logger.info("模糊查找结束,返回数量:" + returnNodeList.size()+",耗时:"+(endtime-starttime));
Map<String, List<ReturnNode>> returnNodeMap = new HashMap<>();
returnNodeMap.put("表",returnNodeList);
if(schemaId.startsWith("Schema=")){
returnNodeMap.put("表",returnNodeList);
}else if(schemaId.startsWith("Table=")){
returnNodeMap.put("字段",returnNodeList);
}
return returnNodeMap;
}
......
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