Commit 90b12cd7 by qiuchaofei

1对没有关系的节点,做了过滤,2修改auth的版本

parent d8a6658a
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.keymobile</groupId> <groupId>com.keymobile</groupId>
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.4.RELEASE</version> <version>2.0.4.RELEASE</version>
<relativePath /> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
...@@ -138,13 +139,13 @@ ...@@ -138,13 +139,13 @@
<dependency> <dependency>
<groupId>com.keymobile.auth</groupId> <groupId>com.keymobile.auth</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>3.0.7-beta</version> <version>3.0.8-beta</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.keymobile.auth</groupId> <groupId>com.keymobile.auth</groupId>
<artifactId>security</artifactId> <artifactId>security</artifactId>
<version>3.0.7-beta</version> <version>3.0.8-beta</version>
</dependency> </dependency>
......
...@@ -22,6 +22,7 @@ import com.keymobile.metadata.metadataRelation.service.impl.MongoDbServiceImpl; ...@@ -22,6 +22,7 @@ import com.keymobile.metadata.metadataRelation.service.impl.MongoDbServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.bson.Document; import org.bson.Document;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -206,12 +207,15 @@ public class MetaDataController { ...@@ -206,12 +207,15 @@ public class MetaDataController {
if (nodeMap.containsKey("" + endId)) { if (nodeMap.containsKey("" + endId)) {
endMetaId = nodeMap.get("" + endId).getId(); endMetaId = nodeMap.get("" + endId).getId();
} }
Edge edge = new Edge(); if(StringUtils.isNotBlank(startMetaId) &&StringUtils.isNotBlank(endMetaId)){
edge.setEdgeId("" + baseRelationship.getId()); Edge edge = new Edge();
edge.setFromId(startMetaId); edge.setEdgeId("" + baseRelationship.getId());
edge.setToId(endMetaId); edge.setFromId(startMetaId);
edge.setType(baseRelationship.getName()); edge.setToId(endMetaId);
returnReslult.getEdges().add(edge); edge.setType(baseRelationship.getName());
returnReslult.getEdges().add(edge);
}
} }
} }
......
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