Commit ef09ea5a by qiuchaofei

修改获取关系类型的方法

parent 81920ba8
...@@ -523,7 +523,17 @@ public class MetaDataController { ...@@ -523,7 +523,17 @@ public class MetaDataController {
@RequestMapping(path = "/listAllRelationType", method = RequestMethod.GET) @RequestMapping(path = "/listAllRelationType", method = RequestMethod.GET)
public List<String> getAllRelationType() { public List<String> getAllRelationType() {
return baseRelationshipService.findAllRelationTypes(); long time1 = System.currentTimeMillis();
List<String> relationTypes = relationTypes = new ArrayList<>();
// baseRelationshipService.findAllRelationTypes();
relationTypes.add("组合");
relationTypes.add("流向");
relationTypes.add("TempRelation");
long time2 = System.currentTimeMillis();
logger.info("查询所有的关系类型,耗时:"+(time2-time1));
return relationTypes;
} }
/** /**
......
package com.keymobile.metadata.metadataRelation.service.impl; package com.keymobile.metadata.metadataRelation.service.impl;
import com.keymobile.metadata.metadataRelation.config.Neo4jConfig;
import com.keymobile.metadata.metadataRelation.pojo.*; import com.keymobile.metadata.metadataRelation.pojo.*;
import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jSchema;
import com.keymobile.metadata.metadataRelation.pojo.metadata.Neo4jSystem;
import com.keymobile.metadata.metadataRelation.respository.*; import com.keymobile.metadata.metadataRelation.respository.*;
import com.keymobile.metadata.metadataRelation.service.IBaseRelationshipService; import com.keymobile.metadata.metadataRelation.service.IBaseRelationshipService;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.Record; import org.neo4j.driver.v1.Record;
import org.neo4j.driver.v1.Session; import org.neo4j.driver.v1.Session;
import org.neo4j.driver.v1.StatementResult; import org.neo4j.driver.v1.StatementResult;
...@@ -26,7 +22,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -26,7 +22,7 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
private static final Logger logger = LoggerFactory.getLogger(BaseRelationshipServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(BaseRelationshipServiceImpl.class);
@Autowired @Autowired
BaseRelationshipRepository refRepository; private BaseRelationshipRepository baseRelationshipRepository;
@Autowired @Autowired
private CompositionRelationRespository compositionRelationRespository; private CompositionRelationRespository compositionRelationRespository;
@Autowired @Autowired
...@@ -82,13 +78,20 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -82,13 +78,20 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
List<String> relationTypes = new ArrayList<>(); List<String> relationTypes = new ArrayList<>();
String cypher = " MATCH ()-[r]->() RETURN distinct type(r) as name "; String cypher = " MATCH ()-[r]->() RETURN distinct type(r) as name ";
logger.info("cypher:" + cypher); long t1 = System.currentTimeMillis();
StatementResult result = session.run(cypher); StatementResult result = session.run(cypher);
long t2 = System.currentTimeMillis();
logger.info("运行cypher:" + cypher + " ,耗时:"+(t2-t1) );
int count = 0;
while (result.hasNext()) { while (result.hasNext()) {
logger.info(""+ (count++));
Record record = (Record) result.next(); Record record = (Record) result.next();
String name = record.get("name").asString(); String name = record.get("name").asString();
logger.info(" ========== "+ name);
if (name.equals("Input")) { if (name.equals("Input")) {
name = "流入"; name = "流入";
} else if (name.equals("Output")) { } else if (name.equals("Output")) {
...@@ -109,18 +112,18 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService { ...@@ -109,18 +112,18 @@ public class BaseRelationshipServiceImpl implements IBaseRelationshipService {
@Override @Override
public BaseRelationship addRelationship(BaseRelationship relationship) { public BaseRelationship addRelationship(BaseRelationship relationship) {
return refRepository.save(relationship); return baseRelationshipRepository.save(relationship);
} }
@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 baseRelationshipRepository.save(relationship);
} }
@Override @Override
public boolean deleteRelationshipById(Long id) { public boolean deleteRelationshipById(Long id) {
refRepository.deleteById(id); baseRelationshipRepository.deleteById(id);
return true; return true;
} }
......
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