Commit 760f0cce by qiuchaofei

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

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