Commit 8e8c413d by qiuchaofei

format 代码

parent ea5f678b
...@@ -13,7 +13,7 @@ import org.springframework.scheduling.annotation.EnableAsync; ...@@ -13,7 +13,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
public class MetadataRelationApplication { public class MetadataRelationApplication {
public static void main(String[] args) { public static void main(String[] args) {
// System.setProperty("es.set.netty.runtime.available.processors", "false"); // System.setProperty("es.set.netty.runtime.available.processors", "false");
SpringApplication.run(MetadataRelationApplication.class, args); SpringApplication.run(MetadataRelationApplication.class, args);
} }
......
...@@ -7,13 +7,13 @@ import org.springframework.context.annotation.Configuration; ...@@ -7,13 +7,13 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class FeignClientConfig { public class FeignClientConfig {
@Value("${security.authUser}") @Value("${security.authUser}")
private String authUser; private String authUser;
@Value("${security.authPwd}") @Value("${security.authPwd}")
private String authPwd; private String authPwd;
@Bean @Bean
public BasicAuthRequestInterceptor getBasicAuthRequestInterceptor() { public BasicAuthRequestInterceptor getBasicAuthRequestInterceptor() {
return new BasicAuthRequestInterceptor(authUser, authPwd); return new BasicAuthRequestInterceptor(authUser, authPwd);
......
...@@ -8,28 +8,28 @@ import org.springframework.context.annotation.Bean; ...@@ -8,28 +8,28 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class Neo4jConfig { public class Neo4jConfig {
@Value("${spring.data.neo4j.url}") @Value("${spring.data.neo4j.url}")
private String neo4jUrl; private String neo4jUrl;
@Value("${spring.data.neo4j.username}") @Value("${spring.data.neo4j.username}")
private String neo4jUsername; private String neo4jUsername;
@Value("${spring.data.neo4j.password}") @Value("${spring.data.neo4j.password}")
private String neo4jPassword; private String neo4jPassword;
private static Driver driver; private static Driver driver;
@Bean @Bean
public Driver getNeo4jConnection() { public Driver getNeo4jConnection() {
if(driver!=null){ if (driver != null) {
}else { } else {
driver = GraphDatabase.driver(neo4jUrl, AuthTokens.basic(neo4jUsername, neo4jPassword)); driver = GraphDatabase.driver(neo4jUrl, AuthTokens.basic(neo4jUsername, neo4jPassword));
} }
return driver; return driver;
} }
......
...@@ -5,7 +5,7 @@ import org.neo4j.ogm.annotation.Property; ...@@ -5,7 +5,7 @@ import org.neo4j.ogm.annotation.Property;
import org.neo4j.ogm.annotation.RelationshipEntity; import org.neo4j.ogm.annotation.RelationshipEntity;
import org.neo4j.ogm.annotation.StartNode; import org.neo4j.ogm.annotation.StartNode;
public class BaseRelationship <S extends BaseNode, E extends BaseNode> extends AllBaseEntity { public class BaseRelationship<S extends BaseNode, E extends BaseNode> extends AllBaseEntity {
@Property @Property
private String name; //关系名称 private String name; //关系名称
...@@ -15,13 +15,14 @@ public class BaseRelationship <S extends BaseNode, E extends BaseNode> extends A ...@@ -15,13 +15,14 @@ public class BaseRelationship <S extends BaseNode, E extends BaseNode> extends A
@EndNode @EndNode
private E end; private E end;
public BaseRelationship(){
public BaseRelationship() {
} }
public BaseRelationship(String name,S start,E end){ public BaseRelationship(String name, S start, E end) {
this.name =name; this.name = name;
this.start=start; this.start = start;
this.end=end; this.end = end;
} }
@Override @Override
......
...@@ -3,5 +3,5 @@ package com.keymobile.metadata.metadataRelation.pojo; ...@@ -3,5 +3,5 @@ package com.keymobile.metadata.metadataRelation.pojo;
import org.neo4j.ogm.annotation.RelationshipEntity; import org.neo4j.ogm.annotation.RelationshipEntity;
@RelationshipEntity(type = "Composition") @RelationshipEntity(type = "Composition")
public class CompositionRelation extends BaseRelationship{ public class CompositionRelation extends BaseRelationship {
} }
...@@ -3,5 +3,5 @@ package com.keymobile.metadata.metadataRelation.pojo; ...@@ -3,5 +3,5 @@ package com.keymobile.metadata.metadataRelation.pojo;
import org.neo4j.ogm.annotation.RelationshipEntity; import org.neo4j.ogm.annotation.RelationshipEntity;
@RelationshipEntity(type = "Dependency") @RelationshipEntity(type = "Dependency")
public class DependencyRelation extends BaseRelationship{ public class DependencyRelation extends BaseRelationship {
} }
...@@ -3,6 +3,6 @@ package com.keymobile.metadata.metadataRelation.pojo; ...@@ -3,6 +3,6 @@ package com.keymobile.metadata.metadataRelation.pojo;
import org.neo4j.ogm.annotation.RelationshipEntity; import org.neo4j.ogm.annotation.RelationshipEntity;
@RelationshipEntity(type = "Execute") @RelationshipEntity(type = "Execute")
public class ExecuteRelation extends BaseRelationship{ public class ExecuteRelation extends BaseRelationship {
} }
...@@ -3,5 +3,5 @@ package com.keymobile.metadata.metadataRelation.pojo; ...@@ -3,5 +3,5 @@ package com.keymobile.metadata.metadataRelation.pojo;
import org.neo4j.ogm.annotation.RelationshipEntity; import org.neo4j.ogm.annotation.RelationshipEntity;
@RelationshipEntity(type = "Input") @RelationshipEntity(type = "Input")
public class InputRelation extends BaseRelationship{ public class InputRelation extends BaseRelationship {
} }
...@@ -6,6 +6,7 @@ import org.neo4j.ogm.annotation.Relationship; ...@@ -6,6 +6,7 @@ import org.neo4j.ogm.annotation.Relationship;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@NodeEntity(label = "MetaData") @NodeEntity(label = "MetaData")
public class MetaData extends BaseNode { public class MetaData extends BaseNode {
public String getMetadataId() { public String getMetadataId() {
...@@ -77,15 +78,15 @@ public class MetaData extends BaseNode { ...@@ -77,15 +78,15 @@ public class MetaData extends BaseNode {
} }
public void addRelation(DependencyRelation friendshipRelation){ public void addRelation(DependencyRelation friendshipRelation) {
if(this.dependencyRelationList == null){ if (this.dependencyRelationList == null) {
dependencyRelationList = new ArrayList<DependencyRelation>(); dependencyRelationList = new ArrayList<DependencyRelation>();
} }
dependencyRelationList.add(friendshipRelation); dependencyRelationList.add(friendshipRelation);
} }
public List<DependencyRelation> getDependencyRelationList() { public List<DependencyRelation> getDependencyRelationList() {
if(this.dependencyRelationList == null){ if (this.dependencyRelationList == null) {
dependencyRelationList = new ArrayList<DependencyRelation>(); dependencyRelationList = new ArrayList<DependencyRelation>();
} }
return dependencyRelationList; return dependencyRelationList;
...@@ -94,12 +95,13 @@ public class MetaData extends BaseNode { ...@@ -94,12 +95,13 @@ public class MetaData extends BaseNode {
public void setDependencyRelationList(List<DependencyRelation> dependencyRelationList) { public void setDependencyRelationList(List<DependencyRelation> dependencyRelationList) {
this.dependencyRelationList = dependencyRelationList; this.dependencyRelationList = dependencyRelationList;
} }
@Relationship(type = "Dependency_RELATION") @Relationship(type = "Dependency_RELATION")
private List<DependencyRelation> dependencyRelationList; private List<DependencyRelation> dependencyRelationList;
public List<DependencyRelation> getCompositionRelationList() { public List<DependencyRelation> getCompositionRelationList() {
if(this.compositionRelationList == null){ if (this.compositionRelationList == null) {
compositionRelationList = new ArrayList<DependencyRelation>(); compositionRelationList = new ArrayList<DependencyRelation>();
} }
return compositionRelationList; return compositionRelationList;
...@@ -110,7 +112,7 @@ public class MetaData extends BaseNode { ...@@ -110,7 +112,7 @@ public class MetaData extends BaseNode {
} }
@Relationship(type = "Composition_RELATION") @Relationship(type = "Composition_RELATION")
private List<DependencyRelation> compositionRelationList ; private List<DependencyRelation> compositionRelationList;
public String getNode() { public String getNode() {
......
...@@ -3,5 +3,5 @@ package com.keymobile.metadata.metadataRelation.pojo; ...@@ -3,5 +3,5 @@ package com.keymobile.metadata.metadataRelation.pojo;
import org.neo4j.ogm.annotation.RelationshipEntity; import org.neo4j.ogm.annotation.RelationshipEntity;
@RelationshipEntity(type = "Output") @RelationshipEntity(type = "Output")
public class OutputRelation extends BaseRelationship{ public class OutputRelation extends BaseRelationship {
} }
...@@ -2,10 +2,10 @@ package com.keymobile.metadata.metadataRelation.pojo; ...@@ -2,10 +2,10 @@ package com.keymobile.metadata.metadataRelation.pojo;
public class RelationMongo { public class RelationMongo {
private String id; private String id;
private String source; private String source;
private String target; private String target;
private String type; private String type;
public String getId() { public String getId() {
return id; return id;
......
...@@ -18,7 +18,7 @@ public class TempNode extends BaseNode { ...@@ -18,7 +18,7 @@ public class TempNode extends BaseNode {
private String catalogName; private String catalogName;
private Long parentId; private Long parentId;
public String getEtlScriptId() { public String getEtlScriptId() {
return etlScriptId; return etlScriptId;
......
...@@ -9,8 +9,6 @@ public class Edge { ...@@ -9,8 +9,6 @@ public class Edge {
private String type; private String type;
public String getEdgeId() { public String getEdgeId() {
return edgeId; return edgeId;
} }
......
...@@ -6,6 +6,7 @@ public class MetaModel { ...@@ -6,6 +6,7 @@ public class MetaModel {
private String cnName; private String cnName;
private String description; private String description;
public String getModelName() { public String getModelName() {
return modelName; return modelName;
} }
......
...@@ -15,7 +15,8 @@ public class Node { ...@@ -15,7 +15,8 @@ public class Node {
private String icon; private String icon;
private String type; private String type;
public String getType() { public String getType() {
return type; return type;
} }
......
...@@ -9,7 +9,7 @@ import java.util.Map; ...@@ -9,7 +9,7 @@ import java.util.Map;
public class ReturnReslult { public class ReturnReslult {
private List<Edge> edges= new ArrayList<>(); private List<Edge> edges = new ArrayList<>();
private List<Node> nodes = new ArrayList<>(); private List<Node> nodes = new ArrayList<>();
...@@ -21,8 +21,7 @@ public class ReturnReslult { ...@@ -21,8 +21,7 @@ public class ReturnReslult {
this.metaModelMap = metaModelMap; this.metaModelMap = metaModelMap;
} }
private Map<String,MetaModel> metaModelMap = new HashedMap(); private Map<String, MetaModel> metaModelMap = new HashedMap();
public List<Edge> getEdges() { public List<Edge> getEdges() {
......
...@@ -9,6 +9,6 @@ import org.springframework.stereotype.Repository; ...@@ -9,6 +9,6 @@ import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
@Repository @Repository
public interface BaseRelationshipRepository extends Neo4jRepository<BaseRelationship,Long> { public interface BaseRelationshipRepository extends Neo4jRepository<BaseRelationship, Long> {
} }
...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; ...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
@Repository @Repository
public interface CompositionRelationRespository extends Neo4jRepository<CompositionRelation,Long> { public interface CompositionRelationRespository extends Neo4jRepository<CompositionRelation, Long> {
@Query("MATCH (n:MetaData{metadataId: $startId}),(n1:MetaData{metadataId: $endId}),p=(n)-[]-(n1) return p") @Query("MATCH (n:MetaData{metadataId: $startId}),(n1:MetaData{metadataId: $endId}),p=(n)-[]-(n1) return p")
List<CompositionRelation> findCompositionRelationship(@Param("startId") String startId, @Param("endId") String endId); List<CompositionRelation> findCompositionRelationship(@Param("startId") String startId, @Param("endId") String endId);
...@@ -17,6 +17,7 @@ public interface CompositionRelationRespository extends Neo4jRepository<Composit ...@@ -17,6 +17,7 @@ public interface CompositionRelationRespository extends Neo4jRepository<Composit
/** /**
* 添加组合关系 * 添加组合关系
*
* @param sourceId * @param sourceId
* @param targetId * @param targetId
* @return * @return
......
...@@ -9,10 +9,11 @@ import org.springframework.stereotype.Repository; ...@@ -9,10 +9,11 @@ import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
@Repository @Repository
public interface ExecuteRelationRepository extends Neo4jRepository<ExecuteRelation,Long> { public interface ExecuteRelationRepository extends Neo4jRepository<ExecuteRelation, Long> {
/** /**
* 添加excute关系 * 添加excute关系
*
* @param sourceId * @param sourceId
* @param targetId * @param targetId
* @return * @return
...@@ -24,5 +25,4 @@ public interface ExecuteRelationRepository extends Neo4jRepository<ExecuteRelati ...@@ -24,5 +25,4 @@ public interface ExecuteRelationRepository extends Neo4jRepository<ExecuteRelati
List<ExecuteRelation> findExecuteRelationship(@Param("startId") String startId, @Param("endId") String endId); List<ExecuteRelation> findExecuteRelationship(@Param("startId") String startId, @Param("endId") String endId);
} }
...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; ...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
@Repository @Repository
public interface InputRelationReRepository extends Neo4jRepository<InputRelation,Long> { public interface InputRelationReRepository extends Neo4jRepository<InputRelation, Long> {
@Query("MATCH (n:MetaData{metadataId: $startId}),(n1:MetaData{metadataId: $endId}),p=(n)-[]-(n1) return p") @Query("MATCH (n:MetaData{metadataId: $startId}),(n1:MetaData{metadataId: $endId}),p=(n)-[]-(n1) return p")
...@@ -18,6 +18,7 @@ public interface InputRelationReRepository extends Neo4jRepository<InputRelation ...@@ -18,6 +18,7 @@ public interface InputRelationReRepository extends Neo4jRepository<InputRelation
/** /**
* 添加input关系 * 添加input关系
*
* @param sourceId * @param sourceId
* @param targetId * @param targetId
* @return * @return
......
...@@ -10,30 +10,30 @@ import org.springframework.stereotype.Repository; ...@@ -10,30 +10,30 @@ import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
@Repository @Repository
public interface MetadataRepository extends Neo4jRepository<MetaData,Long> { public interface MetadataRepository extends Neo4jRepository<MetaData, Long> {
MetaData findMetadataByName(String name); MetaData findMetadataByName(String name);
@Query("match (n:MetaData ) where n.metadataId =~{modelName} return n") @Query("match (n:MetaData ) where n.metadataId =~{modelName} return n")
List<MetaData> findMetaDataByModelName(@Param("modelName") String dataName ); List<MetaData> findMetaDataByModelName(@Param("modelName") String dataName);
//MATCH p=(a:MetaData{metadataId:"Table=1=b148ad31504d4487bd81ecebbc7522c3"})-[r:Composition]->() -[*]->()<-[r1:Composition]-(b:MetaData{metadataId:"Table=368=600efbf1fb4a4bd1910dbc1b567d6691"}) //MATCH p=(a:MetaData{metadataId:"Table=1=b148ad31504d4487bd81ecebbc7522c3"})-[r:Composition]->() -[*]->()<-[r1:Composition]-(b:MetaData{metadataId:"Table=368=600efbf1fb4a4bd1910dbc1b567d6691"})
//RETURN p //RETURN p
MetaData findMetaDataByMetadataId(String id); MetaData findMetaDataByMetadataId(String id);
/** /**
* @Query("MATCH (n : MetaData { metadataId : $startId }), (n1 : MetaData { metadataId : $endId }), p=(n)-[]-(n1) return p")
* List<OutputRelation> findOutputRelationship(@Param("startId") String startId, @Param("endId") String endId);
* @param dataName * @param dataName
* @return * @return
* @Query("MATCH (n : MetaData { metadataId : $startId }), (n1 : MetaData { metadataId : $endId }), p=(n)-[]-(n1) return p")
* List<OutputRelation> findOutputRelationship(@Param("startId") String startId, @Param("endId") String endId);
*/ */
@Query("match data=(na:MetaData{name:{0}})<-[rel*1..3]->(nb:MetaData) return data") @Query("match data=(na:MetaData{name:{0}})<-[rel*1..3]->(nb:MetaData) return data")
List<MetaData> findMetaData(@Param("dataName") String dataName , @Param("n") int n ); List<MetaData> findMetaData(@Param("dataName") String dataName, @Param("n") int n);
@Query("match (data:MetaData{system:{parentName}}) return data") @Query("match (data:MetaData{system:{parentName}}) return data")
List<MetaData> findMetaDataByParentName(@Param("parentName") String parentName ); List<MetaData> findMetaDataByParentName(@Param("parentName") String parentName);
@Query("MATCH p=(n:MetaData {metadataId:{parentId}})-[r:Composition]->(m) RETURN m") @Query("MATCH p=(n:MetaData {metadataId:{parentId}})-[r:Composition]->(m) RETURN m")
List<MetaData> findMetaDataByParentId(@Param("parentId") String parentId); List<MetaData> findMetaDataByParentId(@Param("parentId") String parentId);
......
...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; ...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
@Repository @Repository
public interface OutputRelationRepository extends Neo4jRepository<OutputRelation,Long> { public interface OutputRelationRepository extends Neo4jRepository<OutputRelation, Long> {
@Query("MATCH (n:MetaData{metadataId: $startId}),(n1:MetaData{metadataId: $endId}),p=(n)-[]-(n1) return p") @Query("MATCH (n:MetaData{metadataId: $startId}),(n1:MetaData{metadataId: $endId}),p=(n)-[]-(n1) return p")
List<OutputRelation> findOutputRelationship(@Param("startId") String startId, @Param("endId") String endId); List<OutputRelation> findOutputRelationship(@Param("startId") String startId, @Param("endId") String endId);
...@@ -17,6 +17,7 @@ public interface OutputRelationRepository extends Neo4jRepository<OutputRelation ...@@ -17,6 +17,7 @@ public interface OutputRelationRepository extends Neo4jRepository<OutputRelation
/** /**
* 添加output关系 * 添加output关系
*
* @param sourceId * @param sourceId
* @param targetId * @param targetId
* @return * @return
......
...@@ -20,52 +20,51 @@ public interface IBaseRelationshipService { ...@@ -20,52 +20,51 @@ public interface IBaseRelationshipService {
List<String> findAllRelationTypes(); List<String> findAllRelationTypes();
/** /**
* @desc 添加关系
* @param relationship * @param relationship
* @desc 添加关系
*/ */
BaseRelationship addRelationship(BaseRelationship relationship); BaseRelationship addRelationship(BaseRelationship relationship);
/** /**
* @desc 添加关系 * @param name 关系名称
* @param name 关系名称
* @param startNode 开始节点 * @param startNode 开始节点
* @param endNode 结束节点 * @param endNode 结束节点
* @desc 添加关系
*/ */
BaseRelationship addRelationship(String name, BaseNode startNode, BaseNode endNode); BaseRelationship addRelationship(String name, BaseNode startNode, BaseNode endNode);
/** /**
* @desc 删除关系
* @param id * @param id
* @desc 删除关系
*/ */
boolean deleteRelationshipById(Long id); boolean deleteRelationshipById(Long id);
/** /**
* @desc 获取关系 根据开始节点名称和关系名称 * @param name 关系名称
* @param name 关系名称
* @param startName 开始节点名称 * @param startName 开始节点名称
* @param endName 结束节点名称 * @param endName 结束节点名称
* @desc 获取关系 根据开始节点名称和关系名称
*/ */
List<BaseRelationship> findMetadataRelationshipByAllName(String name, String startName, String endName); List<BaseRelationship> findMetadataRelationshipByAllName(String name, String startName, String endName);
/** /**
* @desc 获取关系 根据节点名称和关系名称 * @param name 关系名称
* @param name 关系名称
* @param startName 开始节点名称 * @param startName 开始节点名称
* @desc 获取关系 根据节点名称和关系名称
*/ */
List<BaseRelationship> findMetadataRelationshipByStartNameAndName(String name, String startName); List<BaseRelationship> findMetadataRelationshipByStartNameAndName(String name, String startName);
/** /**
* @desc 获取关系 根据节点名称和关系名称
* @param startName 开始节点名称 * @param startName 开始节点名称
* @desc 获取关系 根据节点名称和关系名称
*/ */
List<BaseRelationship> findMetadataRelationshipByStartName(String startName); List<BaseRelationship> findMetadataRelationshipByStartName(String startName);
/** /**
* @desc 根据节点名称,获取所有有关系的节点
* @param startName 开始节点名称 * @param startName 开始节点名称
* @desc 根据节点名称, 获取所有有关系的节点
*/ */
List<BaseNode> findMetadataByStartName(String startName); List<BaseNode> findMetadataByStartName(String startName);
} }
...@@ -9,66 +9,68 @@ import java.util.List; ...@@ -9,66 +9,68 @@ import java.util.List;
public interface IMetadataService { public interface IMetadataService {
List<MetaData> findNodeByName (String dataName); List<MetaData> findNodeByName(String dataName);
ReturnReslult findNodeByDataId (String metadataId, int depth); ReturnReslult findNodeByDataId(String metadataId, int depth);
ReturnReslult findResultByModelName (String modelName); ReturnReslult findResultByModelName(String modelName);
List<MetaData> findChildrenByParentId(String parentId); List<MetaData> findChildrenByParentId(String parentId);
List<MetaData> findChildrenByParentName(String parentName); List<MetaData> findChildrenByParentName(String parentName);
List<MetaData> finAllMetaData(); List<MetaData> finAllMetaData();
/** /**
* 添加元数据对象 * 添加元数据对象
*
* @param metaData * @param metaData
*/ */
MetaData addMetaData(MetaData metaData); MetaData addMetaData(MetaData metaData);
/** /**
* @desc 根据名称添加元数据
* @param name * @param name
* @desc 根据名称添加元数据
*/ */
MetaData addMetadataByName(String name); MetaData addMetadataByName(String name);
void syschroRelationFromMongo(String catalogName); void syschroRelationFromMongo(String catalogName);
/** /**
* 添加元数据对象 * 添加元数据对象
*
* @param id * @param id
*/ */
MetaData getMetaDataById(Long id); MetaData getMetaDataById(Long id);
/** /**
* @desc 根据名称获取元数据
* @param name * @param name
* @desc 根据名称获取元数据
*/ */
MetaData getMetadataByName(String name); MetaData getMetadataByName(String name);
/** /**
* @desc 根据ID删除人物节点
* @param id * @param id
* @desc 根据ID删除人物节点
*/ */
boolean deleteMetadata(Long id); boolean deleteMetadata(Long id);
/** /**
* @desc 添加元数据的关系 * @param name 关系名称
* @param name 关系名称
* @param startName 开始节点名称 * @param startName 开始节点名称
* @param endName 结束节点名称 * @param endName 结束节点名称
* @return BaseRelationship * @return BaseRelationship
* @desc 添加元数据的关系
*/ */
BaseRelationship addMetadataRelationship(String name, String startName, String endName); BaseRelationship addMetadataRelationship(String name, String startName, String endName);
/** /**
* @desc 获取任务关系 * @param name 关系名称
* @param name 关系名称
* @param startName 开始节点名称 * @param startName 开始节点名称
* @param endName 结束节点名称 * @param endName 结束节点名称
* @desc 获取任务关系
*/ */
List<BaseRelationship> getMetadataRelationship(String name, String startName, String endName); List<BaseRelationship> getMetadataRelationship(String name, String startName, String endName);
......
...@@ -26,9 +26,9 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -26,9 +26,9 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
@Autowired @Autowired
BaseRelationshipRepository refRepository; BaseRelationshipRepository refRepository;
@Autowired @Autowired
private CompositionRelationRespository compositionRelationRespository ; private CompositionRelationRespository compositionRelationRespository;
@Autowired @Autowired
private InputRelationReRepository inputRelationReRepository ; private InputRelationReRepository inputRelationReRepository;
@Autowired @Autowired
private OutputRelationRepository outputRelationRepository; private OutputRelationRepository outputRelationRepository;
@Autowired @Autowired
...@@ -37,30 +37,30 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -37,30 +37,30 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
@Override @Override
public List<BaseRelationship> findAllRelation() { public List<BaseRelationship> findAllRelation() {
List<CompositionRelation> compositionRelationList = (List<CompositionRelation>)compositionRelationRespository.findAll(); List<CompositionRelation> compositionRelationList = (List<CompositionRelation>) compositionRelationRespository.findAll();
List<InputRelation> inputRelationList = (List<InputRelation>)inputRelationReRepository.findAll(); List<InputRelation> inputRelationList = (List<InputRelation>) inputRelationReRepository.findAll();
List<OutputRelation> outputRelationList = (List<OutputRelation>)outputRelationRepository.findAll(); List<OutputRelation> outputRelationList = (List<OutputRelation>) outputRelationRepository.findAll();
List<ExecuteRelation> executeRelationList = (List<ExecuteRelation>)executeRelationRepository.findAll(); List<ExecuteRelation> executeRelationList = (List<ExecuteRelation>) executeRelationRepository.findAll();
List<BaseRelationship> baseRelationshipList = new ArrayList<>(); List<BaseRelationship> baseRelationshipList = new ArrayList<>();
for(CompositionRelation compositionRelation:compositionRelationList ){ for (CompositionRelation compositionRelation : compositionRelationList) {
compositionRelation.setName("组合"); compositionRelation.setName("组合");
baseRelationshipList.add(compositionRelation); baseRelationshipList.add(compositionRelation);
} }
for(InputRelation inputRelation:inputRelationList ){ for (InputRelation inputRelation : inputRelationList) {
inputRelation.setName("流入"); inputRelation.setName("流入");
baseRelationshipList.add(inputRelation); baseRelationshipList.add(inputRelation);
} }
for(OutputRelation outputRelation:outputRelationList ){ for (OutputRelation outputRelation : outputRelationList) {
outputRelation.setName("流出"); outputRelation.setName("流出");
baseRelationshipList.add(outputRelation); baseRelationshipList.add(outputRelation);
} }
for(ExecuteRelation executeRelation:executeRelationList ){ for (ExecuteRelation executeRelation : executeRelationList) {
executeRelation.setName("执行"); executeRelation.setName("执行");
baseRelationshipList.add(executeRelation); baseRelationshipList.add(executeRelation);
} }
...@@ -76,8 +76,8 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -76,8 +76,8 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
Neo4jConfig neo4jConfig = new Neo4jConfig(); Neo4jConfig neo4jConfig = new Neo4jConfig();
Driver neo4jConnection = neo4jConfig.getNeo4jConnection(); Driver neo4jConnection = neo4jConfig.getNeo4jConnection();
Session session = neo4jConnection.session(); Session session = neo4jConnection.session();
String cypher =" MATCH (n:MetaData)-[r]->() RETURN id(STARTNODE(r)) as startId,id(endNode(r)) as endId, type(r) as name"; String cypher = " MATCH (n:MetaData)-[r]->() RETURN id(STARTNODE(r)) as startId,id(endNode(r)) as endId, type(r) as name";
logger.info("cypher:"+cypher); logger.info("cypher:" + cypher);
StatementResult result = session.run(cypher); StatementResult result = session.run(cypher);
while (result.hasNext()) { while (result.hasNext()) {
...@@ -86,13 +86,13 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -86,13 +86,13 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
Long endId = record.get("endId").asLong(); Long endId = record.get("endId").asLong();
String name = record.get("name").asString(); String name = record.get("name").asString();
if(name.equals("Input")){ if (name.equals("Input")) {
name = "流入"; name = "流入";
}else if(name.equals("Output")){ } else if (name.equals("Output")) {
name = "流出"; name = "流出";
} else if(name.equals("Composition")){ } else if (name.equals("Composition")) {
name = "组合"; name = "组合";
} else if(name.equals("Execute")){ } else if (name.equals("Execute")) {
name = "执行"; name = "执行";
} }
...@@ -101,7 +101,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -101,7 +101,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
// } else { // } else {
// name = startId + "-" + name + "-" + endId; // name = startId + "-" + name + "-" + endId;
// } // }
if(!relationTypes.contains(name)){ if (!relationTypes.contains(name)) {
relationTypes.add(name); relationTypes.add(name);
} }
} }
...@@ -116,7 +116,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -116,7 +116,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
@Override @Override
public BaseRelationship addRelationship(String name, BaseNode startNode, BaseNode endNode) { public BaseRelationship addRelationship(String name, BaseNode startNode, BaseNode endNode) {
BaseRelationship relationship = new BaseRelationship(name,startNode,endNode); BaseRelationship relationship = new BaseRelationship(name, startNode, endNode);
return refRepository.save(relationship); return refRepository.save(relationship);
} }
...@@ -127,7 +127,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -127,7 +127,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
} }
@Override @Override
public List<BaseRelationship> findMetadataRelationshipByAllName(String name, String startName, String endName) { public List<BaseRelationship> findMetadataRelationshipByAllName(String name, String startName, String endName) {
// List<BaseRelationship> ships = refRepository.findRelationshipByAllName(name,startName,endName); // List<BaseRelationship> ships = refRepository.findRelationshipByAllName(name,startName,endName);
// if(ships != null && ships.size()>0) { // if(ships != null && ships.size()>0) {
// return ships; // return ships;
...@@ -136,7 +136,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -136,7 +136,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
} }
@Override @Override
public List<BaseRelationship> findMetadataRelationshipByStartNameAndName(String name, String startName) { public List<BaseRelationship> findMetadataRelationshipByStartNameAndName(String name, String startName) {
// List<BaseRelationship> ships = refRepository.findRelationshipByStartNameAndName(name,startName); // List<BaseRelationship> ships = refRepository.findRelationshipByStartNameAndName(name,startName);
// if(ships != null && ships.size()>0) { // if(ships != null && ships.size()>0) {
// return ships; // return ships;
...@@ -152,6 +152,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -152,6 +152,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
// } // }
return null; return null;
} }
@Override @Override
public List<BaseNode> findMetadataByStartName(String startName) { public List<BaseNode> findMetadataByStartName(String startName) {
// List<BaseNode> nodes = refRepository.findBaseNodeByStartName(startName); // List<BaseNode> nodes = refRepository.findBaseNodeByStartName(startName);
......
...@@ -27,26 +27,27 @@ public class MongoDbServiceImpl { ...@@ -27,26 +27,27 @@ public class MongoDbServiceImpl {
* *
* @return * @return
*/ */
public List<RelationMongo> findAll(String catalogName ) { public List<RelationMongo> findAll(String catalogName) {
logger.info("--------------------->[MongoDB find start]"); logger.info("--------------------->[MongoDB find start]");
try { try {
return mongoTemplate.findAll(RelationMongo.class,"md_relation_"+catalogName); return mongoTemplate.findAll(RelationMongo.class, "md_relation_" + catalogName);
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
} }
} }
/** /**
* 查询所有 * 查询所有
* *
* @return * @return
*/ */
public List<RelationMongo> findAll( ) { public List<RelationMongo> findAll() {
logger.info("--------------------->[MongoDB find start]"); logger.info("--------------------->[MongoDB find start]");
try { try {
return mongoTemplate.findAll(RelationMongo.class,"md_relational"); return mongoTemplate.findAll(RelationMongo.class, "md_relational");
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
} }
...@@ -55,7 +56,7 @@ public class MongoDbServiceImpl { ...@@ -55,7 +56,7 @@ public class MongoDbServiceImpl {
public void saveTempRelation(List<JSONObject> list, String catalogName) { public void saveTempRelation(List<JSONObject> list, String catalogName) {
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return ; return;
} }
list.forEach(o -> mongoTemplate.save(o, PREFIX_MD_RELATION_TEMP_NODE + catalogName)); list.forEach(o -> mongoTemplate.save(o, PREFIX_MD_RELATION_TEMP_NODE + catalogName));
} }
......
...@@ -18,7 +18,7 @@ public class Neo4jTool { ...@@ -18,7 +18,7 @@ public class Neo4jTool {
Object value = map.get(key); Object value = map.get(key);
// 得到property对应的setter方法 // 得到property对应的setter方法
Method setter = property.getWriteMethod(); Method setter = property.getWriteMethod();
if(setter!=null) { if (setter != null) {
try { try {
setter.invoke(obj, value); setter.invoke(obj, value);
} catch (Exception e) { } catch (Exception e) {
......
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