Commit 24533447 by qiuchaofei

1,按照名称返回图形

parent 07d5ccc6
...@@ -66,12 +66,27 @@ public class MetaDataController { ...@@ -66,12 +66,27 @@ public class MetaDataController {
* 如果是etljob,则查找job的拥有的节点,job的前后关系 * 如果是etljob,则查找job的拥有的节点,job的前后关系
*/ */
// //
@ApiOperation(tags = "", value = "查询结果的图形") @ApiOperation(tags = "", value = "按照元数据名称生成图形")
@RequestMapping(path = "/searchGraph", method = RequestMethod.GET) @RequestMapping(path = "/searchGraph", method = RequestMethod.GET)
public ReturnReslult searchGraph(String metadataId,String layer){ public ReturnReslult searchGraph(String metadataName,String layer){
int layerLong = Integer.valueOf(layer);
ReturnReslult returnReslult = null;
List<MetaData> metadataList = metadataService.getMetadataByName(metadataName);
if(metadataList != null && metadataList.size()!=0){
String metatadaId = metadataList.get(0).getMetadataId();
returnReslult = metadataService.searchGraph(metatadaId,layerLong);
}else {
logger.info("没有找到元数据:"+metadataName);
}
return returnReslult ;
}
@ApiOperation(tags = "", value = "按照元数据Id生成图形")
@RequestMapping(path = "/searchGraph", method = RequestMethod.GET)
public ReturnReslult searchGraphByMetadataId(String metatadaId,String layer){
int layerLong = Integer.valueOf(layer); int layerLong = Integer.valueOf(layer);
return metadataService.searchGraph(metadataId,layerLong);
return metadataService.searchGraph(metatadaId,layerLong);
} }
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
@Repository @Repository
public interface MetadataRepository extends Neo4jRepository<MetaData, Long> { public interface MetadataRepository extends Neo4jRepository<MetaData, Long> {
MetaData findMetadataByName(String name); List<MetaData> findMetadataByName(String name);
@Query("match (n:MetaData ) where n.metadataId =~{modelName} return n") @Query("match (n:MetaData ) where n.metadataId =~{modelName} return n")
......
...@@ -59,7 +59,7 @@ public interface IMetadataService { ...@@ -59,7 +59,7 @@ public interface IMetadataService {
* @param name * @param name
* @desc 根据名称获取元数据 * @desc 根据名称获取元数据
*/ */
MetaData getMetadataByName(String name); List<MetaData> getMetadataByName(String name);
/** /**
* @param id * @param id
......
...@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome; import org.springframework.boot.system.ApplicationHome;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.query.Meta;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import sun.misc.BASE64Encoder; import sun.misc.BASE64Encoder;
...@@ -1112,8 +1113,8 @@ public class MetadataServiceImpl implements IMetadataService { ...@@ -1112,8 +1113,8 @@ public class MetadataServiceImpl implements IMetadataService {
} }
@Override @Override
public MetaData getMetadataByName(String name) { public List<MetaData> getMetadataByName(String name) {
return null; return metadataRepository.findMetadataByName(name);
} }
@Override @Override
...@@ -1124,9 +1125,10 @@ public class MetadataServiceImpl implements IMetadataService { ...@@ -1124,9 +1125,10 @@ public class MetadataServiceImpl implements IMetadataService {
@Override @Override
public BaseRelationship addMetadataRelationship(String name, String startName, String endName) { public BaseRelationship addMetadataRelationship(String name, String startName, String endName) {
//获取人物节点 //获取人物节点
MetaData startMetadata = getMetadataByName(startName); List<MetaData> startMetadataList = getMetadataByName(startName);
MetaData endMetadata = getMetadataByName(endName); List<MetaData> endMetadataList = getMetadataByName(endName);
MetaData startMetadata = startMetadataList.get(0);
MetaData endMetadata = endMetadataList.get(0);
/** /**
* 添加关系有如下几种情况: * 添加关系有如下几种情况:
* 1.元数据节点全部存在: * 1.元数据节点全部存在:
......
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