包含表支持传递数组

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

@@ -108,9 +108,9 @@ public class AnalyseUtilsDBController extends BaseController {
     @Slave
     public RequestResult distanceTableWkt(@RequestParam(value = "tableName") String tableName,
                                           @RequestParam(value = "tableIds", required = false) List<String> tableIds,
-                                          @RequestParam(value = "ewkt") String ewkt,
+                                          @RequestParam(value = "wkt") String wkt,
                                           @RequestParam(value = "distance") Integer distance) {
-        return RequestResult.success(analyseUtilsDBService.distanceTableWkt(tableName, tableIds, ewkt, distance));
+        return RequestResult.success(analyseUtilsDBService.distanceTableWkt(tableName, tableIds, wkt, distance));
     }
 
     /**

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 ewkt      wkt
+     * @param wkt      wkt
      * @return
      */
     List<String> distanceTableWkt(
             @Param("tableName") String tableName,
             @Param("tableIds") List<String> tableIds,
-            @Param("ewkt") String ewkt,
+            @Param("wkt") String wkt,
             @Param("distance") Integer distance);
 
     /**

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/AnalyseUtilsDBService.java

@@ -75,12 +75,12 @@ public interface AnalyseUtilsDBService {
      *
      * @param inputTable  TABLE名称（vater空间中表）
      * @param inputIds    查询数据集ID
-     * @param containsWkt wkt
+     * @param wkt wkt
      * @return
      */
     List<String> distanceTableWkt(String inputTable,
                                   List<String> inputIds,
-                                  String containsWkt,
+                                  String wkt,
                                   Integer distance);
     /**
      * 计算TableA距离范围内TableB中的数据，返回tableB id

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

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

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

@@ -115,7 +115,7 @@
         WHERE 1=1
         <if test="tableIdsB != null and tableIdsB.size()>0 ">
             and (tableB.id)::VARCHAR in
-            <foreach collection="inputIdsA" item="id" open="(" close=")" separator=",">#{id}</foreach>
+            <foreach collection="tableIdsB" item="tableId" open="(" close=")" separator=",">#{tableId}</foreach>
         </if>
         AND EXISTS (
         SELECT 1
@@ -130,9 +130,9 @@
         where public.st_distance(
         inTbale.geom::geography,
         public.st_geomfromewkt(${ewkt})::geography) &lt; #{distance}
-        <if test="inputIds != null and inputIds.size()>0 ">
+        <if test="tableIds != null and tableIds.size()>0 ">
             and (inTbale.id)::VARCHAR in
-            <foreach collection="inputIds" item="id" open="(" close=")" separator=",">#{id}</foreach>
+            <foreach collection="tableIds" item="tableId" open="(" close=")" separator=",">#{tableId}</foreach>
         </if>
     </select>