Răsfoiți Sursa

fix approve subtask

allen 2 ani în urmă
părinte
comite
b201b55da1

+ 2 - 2
kgraph-graph/src/main/java/com/kgraph/graph/neo4j/controller/KgController.java

@@ -78,9 +78,9 @@ public class KgController extends BaseController {
     }
 
     @GetMapping("/getRelationByLikeName")
-    public AjaxResult getRelationByLikeName(String name) {
+    public AjaxResult getRelationByLikeName(String name, Integer type) {
         // TODO length 的最大最小值,从数据字典获取
-        GraphVO graphVO = Neo4j2VOUtils.relation2GraphVO(kgService.getRelationByLikeName(name));
+        GraphVO graphVO = Neo4j2VOUtils.relation2GraphVO(kgService.getRelationByLikeName(name, type));
         return AjaxResult.success(graphVO);
     }
 

+ 3 - 0
kgraph-graph/src/main/java/com/kgraph/graph/neo4j/mapper/RelationRepository.java

@@ -41,4 +41,7 @@ public interface RelationRepository extends Neo4jRepository<Neo4jRelation, Long>
 
     @Query("match data=(e1:Entity)-[r:Relation]-(e2:Entity) where e1.name =~ $name and e2.name =~ $name return data")
     List<Neo4jRelation> getRelationByLikeName(@Param("name") String name);
+
+    @Query("match data=(e1:Entity)-[r:Relation]-(e2:Entity) where e1.name =~ $name return data")
+    List<Neo4jRelation> getRelationByLikeName2(@Param("name") String name);
 }

+ 1 - 1
kgraph-graph/src/main/java/com/kgraph/graph/neo4j/seavice/IKgService.java

@@ -21,5 +21,5 @@ public interface IKgService {
 
     String analysis(String question);
 
-    List<Neo4jRelation> getRelationByLikeName(String name);
+    List<Neo4jRelation> getRelationByLikeName(String name, Integer type);
 }

+ 6 - 2
kgraph-graph/src/main/java/com/kgraph/graph/neo4j/seavice/impl/KgServiceImpl.java

@@ -201,8 +201,12 @@ public class KgServiceImpl implements IKgService {
     }
 
     @Override
-    public List<Neo4jRelation> getRelationByLikeName(String name) {
-        return relationRepository.getRelationByLikeName(".*" + name + ".*");
+    public List<Neo4jRelation> getRelationByLikeName(String name, Integer type) {
+        if (0 == type) {
+            return relationRepository.getRelationByLikeName2(".*" + name + ".*");
+        } else {
+            return relationRepository.getRelationByLikeName(".*" + name + ".*");
+        }
     }
 
 }