Merge pull request #303 from n3A87/0527

feat: shortestOptionalPath() with configurable Edge types and directions to find shortest paths by srcId and dstId
nebula-contrib · Jun 10, 2024 · 5bd87a2 · 5bd87a2
2 parents c991bd7 + 1a2d664
commit 5bd87a2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NebulaBasicDaoTests.java b/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NebulaBasicDaoTests.java
@@ -570,6 +570,13 @@ public void shortestPath() {
     List<NgPath<String>> ngPaths = repository.shortestPath("吴小极", "刘小洲");
     System.out.println(JSON.toJSONString(ngPaths));
   }
+
+  @Test
+  public void shortestOptionalPath() {
+    List<NgPath<String>> ngPaths = repository.shortestOptionalPath("吴小极", "刘小洲",
+            Arrays.asList("like"),"BIDIRECT");
+    System.out.println(JSON.toJSONString(ngPaths));
+  }
   // endregion
 
   @Test

diff --git a/src/main/java/org/nebula/contrib/ngbatis/proxy/NebulaDaoBasic.java b/src/main/java/org/nebula/contrib/ngbatis/proxy/NebulaDaoBasic.java
@@ -529,6 +529,25 @@ default List<NgPath<I>> shortestPath(@Param("srcId") I srcId, @Param("dstId") I
     return (List<NgPath<I>>) MapperProxy.invoke(classModel, methodModel, srcId, dstId);
   }
 
+  /**
+   * 查找指定起始点和目的点之间的最短路径
+   * @param srcId 起始点id
+   * @param dstId 目的点id
+   * @param edgeTypeList Edge type 列表
+   * @param direction REVERSELY表示反向，BIDIRECT表示双向
+   * @return 起始点和目的点之间的最短路径
+   */
+  default List<NgPath<I>> shortestOptionalPath(@Param("srcId") I srcId,@Param("dstId") I dstId,
+          @Param("edgeTypeList") List<String> edgeTypeList,
+          @Param("direction") String direction
+  ) {
+    MethodModel methodModel = getMethodModel();
+    methodModel.setReturnType(Collection.class);
+    methodModel.setResultType(NgPath.class);
+    ClassModel classModel = getClassModel(this.getClass());
+    return (List<NgPath<I>>) MapperProxy.invoke(classModel, methodModel,
+            srcId, dstId,edgeTypeList,direction);
+  }
 
   // endregion
 

diff --git a/src/main/resources/NebulaDaoBasic.xml b/src/main/resources/NebulaDaoBasic.xml
@@ -317,7 +317,7 @@
 
 
     <delete id="deleteByIdBatch">
-	DELETE VERTEX  ${ ng.join( p0, ", ", "ng.valueFmt" ) }
+        DELETE VERTEX  ${ ng.join( p0, ", ", "ng.valueFmt" ) }
     </delete>
     <!--endregion-->
 
@@ -415,6 +415,15 @@
         @var dstId = ng.valueFmt( dstId );
         FIND SHORTEST PATH FROM ${ srcId } TO ${ dstId } OVER * YIELD path AS p
     </select>
+
+    <select id="shortestOptionalPath" resultType="org.nebula.contrib.ngbatis.models.data.NgPath">
+        @var srcId = ng.valueFmt( srcId );
+        @var dstId = ng.valueFmt( dstId );
+
+        FIND SHORTEST PATH FROM ${ srcId } TO ${ dstId }
+        OVER ${ isNotEmpty(edgeTypeList) ? ng.join(edgeTypeList) : '*' } ${ isNotEmpty( direction ) ? direction : ''  }
+        YIELD path AS p;
+    </select>
     <!--endregion-->
 
 </mapper>