距离测试成功

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/analyse/AnalyseUtilsDBController.java

@@ -68,7 +68,7 @@ public class AnalyseUtilsDBController extends BaseController {
      *
      * @param tableName TABLE名称（vater空间中表）
      * @param tableIds  查询数据集ID
-     * @param wkt      wkt
+     * @param wkt       wkt
      * @return
      */
     @PostMapping("/contains/table_wkt")
@@ -101,7 +101,7 @@ public class AnalyseUtilsDBController extends BaseController {
      *
      * @param tableName TABLE名称（vater空间中表）
      * @param tableIds  查询数据集ID
-     * @param ewkt      wkt
+     * @param wkt       wkt
      * @return
      */
     @PostMapping("/distance/table_wkt")

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/AnalyseUtilsDBMapper.java

@@ -76,13 +76,13 @@ public interface AnalyseUtilsDBMapper {
      *
      * @param tableName TABLE名称（vater空间中表）
      * @param tableIds  查询数据集ID
-     * @param wkt      wkt
+     * @param ewkt      wkt
      * @return
      */
     List<String> distanceTableWkt(
             @Param("tableName") String tableName,
             @Param("tableIds") List<String> tableIds,
-            @Param("wkt") String wkt,
+            @Param("ewkt") String ewkt,
             @Param("distance") Integer distance);
 
     /**

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/AnalyseUtilsDBServiceImpl.java

@@ -38,7 +38,8 @@ public class AnalyseUtilsDBServiceImpl implements AnalyseUtilsDBService {
 
     @Override
     public List<String> distanceTableWkt(String tableName, List<String> tableIds, String wkt, Integer distance) {
-        return analyseUtilsDBMapper.distanceTableWkt(tableName, tableIds, wkt, distance);
+        String ewkt=Srid4326+wkt;
+        return analyseUtilsDBMapper.distanceTableWkt(tableName, tableIds, ewkt, distance);
     }
 
     @Override

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/raster/AnalyseUtilsDBMapper.xml

@@ -128,8 +128,8 @@
         SELECT id
         FROM "${tableName}" inTbale
         where public.st_distance(
-        inTbale.geom::geography,
-        public.st_geomfromewkt(${ewkt})::geography) < #{distance}
+        inTbale.geom::public.geography,
+        public.st_geomfromewkt(#{ewkt})::public.geography) < #{distance}
         <if test="tableIds != null and tableIds.size()>0 ">
             and (inTbale.id)::VARCHAR in
             <foreach collection="tableIds" item="tableId" open="(" close=")" separator=",">#{tableId}</foreach>
@@ -140,8 +140,8 @@
         SELECT id
         FROM "${tableName}" inTbale
         where public.st_distance(
-        inTbale.geom::geography,
-        public.st_geomfromewkt(#{ewkt})::geography) &lt; #{distance}
+        inTbale.geom::public.geography,
+        public.st_geomfromewkt(#{ewkt})::public.geography) &lt; #{distance}
         <if test="inputIds != null and inputIds.size()>0 ">
             and (inTbale.id)::VARCHAR in
             <foreach collection="inputIds" item="id" open="(" close=")" separator=",">#{id}</foreach>