交集计算添加

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

@@ -1,6 +1,6 @@
 package com.onemap.analyse.controller.analyse;
 
-import com.onemap.analyse.domain.AnalyseUtilsVo;
+import com.onemap.analyse.domain.vo.*;
 import com.onemap.analyse.service.AnalyseUtilsDBService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
@@ -20,48 +20,23 @@ public class AnalyseUtilsDBController extends BaseController {
     @Autowired
     private AnalyseUtilsDBService analyseUtilsDBService;
 
-    /**
-     * table中与wkt数据是否有交集
-     *
-     * @param inputTable        TABLE名称（vater空间中表）
-     * @param inputSRID         table
-     * @param inputIds          查询数据集ID
-     * @param intersectsWkt     wkt
-     * @param intersectsWktSRID wkt对应的坐标
-     * @return
-     */
-    @PostMapping("/intersects/table_wkt")
-    @Slave
-    public RequestResult intersectsTableWkt(@RequestParam(value = "inputTable") String inputTable,
-                                            @RequestParam(value = "inputSRID", required = false) Integer inputSRID,
-                                            @RequestParam(value = "inputIds", required = false) List<String> inputIds,
-                                            @RequestParam(value = "intersectsWkt") String intersectsWkt,
-                                            @RequestParam(value = "intersectsWktSRID", required = false) Integer intersectsWktSRID) {
-        return RequestResult.success(analyseUtilsDBService.intersectsTableWkt(inputTable, inputSRID, inputIds, intersectsWkt, intersectsWktSRID));
-    }
 
     /**
      * table中与wkt数据是否有交集
      *
-     * @param inputTable        TABLE名称（vater空间中表）
-     * @param inputSRID         table
-     * @param inputIds          查询数据集ID
-     * @param intersectsWkt     wkt
-     * @param intersectsWktSRID wkt对应的坐标
+     * @param analyseUtilsVo
      * @return
      */
-    @PostMapping("/intersects/table_wkt_v1")
+    @PostMapping("/intersects/table_wkt")
     @Slave
-    public RequestResult intersectsTableWktV1(@RequestBody AnalyseUtilsVo analyseUtilsVo) {
+    public RequestResult intersectsTableWktV(@RequestBody IntersectsTableWktVo analyseUtilsVo) {
         if (analyseUtilsVo == null) {
             RequestResult.error("analyseUtilsVo is null");
         }
         return RequestResult.success(analyseUtilsDBService.intersectsTableWkt(
-                analyseUtilsVo.getInputTable(),
-                analyseUtilsVo.getInputSRID(),
-                analyseUtilsVo.getInputIds(),
-                analyseUtilsVo.getAnalyseWkt(),
-                analyseUtilsVo.getAnalyseWktSRID()));
+                analyseUtilsVo.getTableName(),
+                analyseUtilsVo.getTableIds(),
+                analyseUtilsVo.getEwkt()));
     }
 
 
@@ -78,102 +53,74 @@ public class AnalyseUtilsDBController extends BaseController {
      */
     @PostMapping("/intersection/table_wkt")
     @Slave
-    public RequestResult intersectionTableWkt(@RequestParam(value = "inputTable") String inputTable,
-                                              @RequestParam(value = "inputSRID", required = false) Integer inputSRID,
-                                              @RequestParam(value = "inputIds", required = false) List<String> inputIds,
-                                              @RequestParam(value = "intersectionWkt") String intersectionWkt,
-                                              @RequestParam(value = "intersectionWktSRID", required = false) Integer intersectionWktSRID,
-                                              @RequestParam(value = "outputColumn", required = false) List<String> outputColumn) {
+    public RequestResult intersectionTableWkt(@RequestParam(value = "inputTable") String inputTable, @RequestParam(value = "inputSRID", required = false) Integer inputSRID, @RequestParam(value = "inputIds", required = false) List<String> inputIds, @RequestParam(value = "intersectionWkt") String intersectionWkt, @RequestParam(value = "intersectionWktSRID", required = false) Integer intersectionWktSRID, @RequestParam(value = "outputColumn", required = false) List<String> outputColumn) {
         return RequestResult.success(analyseUtilsDBService.intersectionTableWkt(inputTable, inputSRID, inputIds, intersectionWkt, intersectionWktSRID, outputColumn));
     }
 
-    /**
-     * table中与wkt数据取交集
-     *
-     * @param inputTable          TABLE名称（vater空间中表）
-     * @param inputSRID           table
-     * @param inputIds            查询数据集ID
-     * @param intersectionWkt     wkt
-     * @param intersectionWktSRID wkt对应的坐标
-     * @param outputColumn        返回TABLE表中的字段，先已返回，ID，GEOM（交集的）,geom_area （交集的）
-     * @return
-     */
-    @PostMapping("/intersection/table_wkt_v1")
-    @Slave
-    public RequestResult intersectionTableWktV1(@RequestBody AnalyseUtilsVo analyseUtilsVo) {
-        return RequestResult.success(analyseUtilsDBService.intersectionTableWkt(analyseUtilsVo.getInputTable(),
-                analyseUtilsVo.getInputSRID(),
-                analyseUtilsVo.getInputIds(),
-                analyseUtilsVo.getAnalyseWkt(),
-                analyseUtilsVo.getAnalyseWktSRID(),
-                analyseUtilsVo.getOutputColumn()));
-    }
+    // /**
+    //  * table中与wkt数据取交集
+    //  *
+    //  * @param inputTable          TABLE名称（vater空间中表）
+    //  * @param inputSRID           table
+    //  * @param inputIds            查询数据集ID
+    //  * @param intersectionWkt     wkt
+    //  * @param intersectionWktSRID wkt对应的坐标
+    //  * @param outputColumn        返回TABLE表中的字段，先已返回，ID，GEOM（交集的）,geom_area （交集的）
+    //  * @return
+    //  */
+    // @PostMapping("/intersection/table_wkt_v1")
+    // @Slave
+    // public RequestResult intersectionTableWktV1(@RequestBody IntersectsTableWktVo analyseUtilsVo) {
+    //     return RequestResult.success(analyseUtilsDBService.intersectionTableWkt(analyseUtilsVo.getInputTable(), analyseUtilsVo.getInputSRID(), analyseUtilsVo.getInputIds(), analyseUtilsVo.getAnalyseWkt(), analyseUtilsVo.getAnalyseWktSRID(), analyseUtilsVo.getOutputColumn()));
+    // }
 
 
     /**
      * 计算wkt包含table中的数据，返回table id
      *
-     * @param tableName TABLE名称（vater空间中表）
-     * @param tableIds  查询数据集ID
-     * @param ewkt       wkt
+     * @param containsTableWktVo
      * @return
      */
     @PostMapping("/contains/table_wkt")
     @Slave
-    public RequestResult containsTableWkt(@RequestParam(value = "tableName") String tableName,
-                                          @RequestParam(value = "tableIds", required = false) List<String> tableIds,
-                                          @RequestParam(value = "ewkt") String ewkt) {
-        return RequestResult.success(analyseUtilsDBService.containsTableWkt(tableName, tableIds, ewkt));
+    public RequestResult containsTableWkt(ContainsTableWktVo containsTableWktVo) {
+        return RequestResult.success(analyseUtilsDBService.containsTableWkt(containsTableWktVo.getTableName(), containsTableWktVo.getTableIds(), containsTableWktVo.getEwkt()));
     }
 
     /**
      * 计算TableA包含TableB中的数据，返回tableB id
      *
-     * @param tableNameA
-     * @param tableNameB
-     * @param tableIdsB
+     * @param containsTablesVo
      * @return
      */
     @PostMapping("/contains/tables")
     @Slave
-    public RequestResult containsTables(@RequestParam(value = "inputTableA") String tableNameA,
-                                        @RequestParam(value = "inputTableB") String tableNameB,
-                                        @RequestParam(value = "inputIdsB", required = false) List<String> tableIdsB) {
-        return RequestResult.success(analyseUtilsDBService.containsTables(tableNameA, tableNameB, tableIdsB));
+    public RequestResult containsTables(ContainsTablesVo containsTablesVo) {
+        return RequestResult.success(analyseUtilsDBService.containsTables(containsTablesVo.getTableNameA(), containsTablesVo.getTableNameB(), containsTablesVo.getTableIdsB()));
     }
 
 
     /**
      * 计算wkt距离范围内table中的数据，返回table id
      *
-     * @param tableName TABLE名称（vater空间中表）
-     * @param tableIds  查询数据集ID
-     * @param ewkt       wkt
+     * @param distanceTableWktVo
      * @return
      */
     @PostMapping("/distance/table_wkt")
     @Slave
-    public RequestResult distanceTableWkt(@RequestParam(value = "tableName") String tableName,
-                                          @RequestParam(value = "tableIds", required = false) List<String> tableIds,
-                                          @RequestParam(value = "wkt") String ewkt,
-                                          @RequestParam(value = "distance") Integer distance) {
-        return RequestResult.success(analyseUtilsDBService.distanceTableWkt(tableName, tableIds, ewkt, distance));
+    public RequestResult distanceTableWkt(DistanceTableWktVo distanceTableWktVo) {
+        return RequestResult.success(analyseUtilsDBService.distanceTableWkt(distanceTableWktVo.getTableName(), distanceTableWktVo.getTableIds(), distanceTableWktVo.getEwkt(), distanceTableWktVo.getDistance()));
     }
 
     /**
      * 计算距离TableA小于指定距离中TableB中的数据，返回tableB id
      *
-     * @param inputTableA
-     * @param inputTableB
-     * @param inputIdsB
+     * @param distanceTablesVo
      * @return
      */
     @PostMapping("/distance/tables")
     @Slave
-    public RequestResult distanceTables(@RequestParam(value = "inputTableA") String inputTableA,
-                                        @RequestParam(value = "inputTableB") String inputTableB,
-                                        @RequestParam(value = "inputIdsB", required = false) List<String> inputIdsB,
-                                        @RequestParam(value = "distance") Integer distance) {
-        return RequestResult.success(analyseUtilsDBService.distanceTables(inputTableA, inputTableB, inputIdsB, distance));
+    public RequestResult distanceTables(DistanceTablesVo distanceTablesVo) {
+        return RequestResult.success(analyseUtilsDBService.distanceTables(distanceTablesVo.getTableNameA(), distanceTablesVo.getTableNameB(), distanceTablesVo.getTableIdsB(), distanceTablesVo.getDistance()));
     }
 }

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

@@ -1,5 +1,7 @@
 package com.onemap.analyse.controller.analyse;
 
+import com.onemap.analyse.domain.vo.BufferTablesVo;
+import com.onemap.analyse.domain.vo.DifferenceTablesVo;
 import com.onemap.analyse.service.CreateUtilsDBService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
@@ -32,9 +34,10 @@ public class CreateUtilsDBController extends BaseController {
      */
     @PostMapping("/buffer/tables")
     @Slave
-    public RequestResult bufferTables(@RequestParam(value = "tableName") String tableName,
-                                      @RequestParam(value = "radius") Float radius) {
-        String newTable = createUtilsDBService.bufferTable(tableName, radius);
+    public RequestResult bufferTables(BufferTablesVo bufferTablesVo) {
+        String newTable = createUtilsDBService.bufferTable(
+                bufferTablesVo.getTableName(),
+                bufferTablesVo.getRadius());
 
         Map<String, String> result = new HashMap<>();
         result.put("tableName", newTable);
@@ -51,10 +54,11 @@ public class CreateUtilsDBController extends BaseController {
      */
     @PostMapping("/difference/tables")
     @Slave
-    public RequestResult differenceTables(@RequestParam(value = "tableNameA") String tableNameA,
-                                          @RequestParam(value = "inputIdsA", required = false) List<String> inputIdsA,
-                                          @RequestParam(value = "tableNameB") String tableNameB) {
-        String newTable = createUtilsDBService.differenceTables(tableNameA, inputIdsA, tableNameB);
+    public RequestResult differenceTables(DifferenceTablesVo differenceTablesVo) {
+        String newTable = createUtilsDBService.differenceTables(
+                differenceTablesVo.getTableNameA(),
+                differenceTablesVo.getTableIdsA(),
+                differenceTablesVo.getTableNameB());
         Map<String, String> result = new HashMap<>();
         result.put("tableName", newTable);
         return RequestResult.success(newTable);

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/AnalyseUtilsVo.java

@@ -1,70 +0,0 @@
-package com.onemap.analyse.domain;
-
-import java.util.List;
-
-public class AnalyseUtilsVo {
-
-    private String inputTable;
-    private Integer inputSRID;
-    private List<String> inputIds;
-    private String analyseType;
-    private String analyseWkt;
-    private Integer analyseWktSRID;
-    List<String> outputColumn;
-
-    public String getInputTable() {
-        return inputTable;
-    }
-
-    public void setInputTable(String inputTable) {
-        this.inputTable = inputTable;
-    }
-
-    public Integer getInputSRID() {
-        return inputSRID;
-    }
-
-    public void setInputSRID(Integer inputSRID) {
-        this.inputSRID = inputSRID;
-    }
-
-    public List<String> getInputIds() {
-        return inputIds;
-    }
-
-    public void setInputIds(List<String> inputIds) {
-        this.inputIds = inputIds;
-    }
-
-    public String getAnalyseType() {
-        return analyseType;
-    }
-
-    public void setAnalyseType(String analyseType) {
-        this.analyseType = analyseType;
-    }
-
-    public String getAnalyseWkt() {
-        return analyseWkt;
-    }
-
-    public void setAnalyseWkt(String analyseWkt) {
-        this.analyseWkt = analyseWkt;
-    }
-
-    public Integer getAnalyseWktSRID() {
-        return analyseWktSRID;
-    }
-
-    public void setAnalyseWktSRID(Integer analyseWktSRID) {
-        this.analyseWktSRID = analyseWktSRID;
-    }
-
-    public List<String> getOutputColumn() {
-        return outputColumn;
-    }
-
-    public void setOutputColumn(List<String> outputColumn) {
-        this.outputColumn = outputColumn;
-    }
-}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/BufferTablesVo.java

@@ -0,0 +1,9 @@
+package com.onemap.analyse.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class BufferTablesVo {
+    String tableName;
+    Float radius;
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/ContainsTableWktVo.java

@@ -0,0 +1,12 @@
+package com.onemap.analyse.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ContainsTableWktVo {
+    String tableName;
+    List<String> tableIds;
+    String ewkt;
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/ContainsTablesVo.java

@@ -0,0 +1,12 @@
+package com.onemap.analyse.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ContainsTablesVo {
+    String tableNameA;
+    String tableNameB;
+    List<String> tableIdsB;
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/DifferenceTablesVo.java

@@ -0,0 +1,12 @@
+package com.onemap.analyse.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DifferenceTablesVo {
+    String tableNameA;
+    List<String> tableIdsA;
+    String tableNameB;
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/DistanceTableWktVo.java

@@ -0,0 +1,13 @@
+package com.onemap.analyse.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DistanceTableWktVo {
+    String tableName;
+    List<String> tableIds;
+    String ewkt;
+    Integer distance;
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/DistanceTablesVo.java

@@ -0,0 +1,13 @@
+package com.onemap.analyse.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DistanceTablesVo {
+    String tableNameA;
+    String tableNameB;
+    List<String> tableIdsB;
+    Integer distance;
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/IntersectsTableWktVo.java

@@ -0,0 +1,17 @@
+package com.onemap.analyse.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class IntersectsTableWktVo {
+    private String tableName;
+    private List<String> tableIds;
+    private String ewkt;
+
+    // private Integer inputSRID;
+    // private String analyseType;
+    // // private Integer analyseWktSRID;
+    // List<String> outputColumn;
+}

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

@@ -12,19 +12,15 @@ public interface AnalyseUtilsDBMapper {
     /**
      * table中与wkt数据是否有交集
      *
-     * @param inputTable        TABLE名称（vater空间中表）
-     * @param inputSRID         table
-     * @param inputIds          查询数据集ID
-     * @param intersectsWkt     wkt
-     * @param intersectsWktSRID wkt对应的坐标
+     * @param tableName TABLE名称（vater空间中表）
+     * @param tableIds  查询数据集ID
+     * @param ewkt      ewkt
      * @return
      */
-    List<String> intersectsTableWkt(
-            @Param("inputTable") String inputTable,
-            @Param("inputSRID") Integer inputSRID,
-            @Param("inputIds") List<String> inputIds,
-            @Param("intersectsWkt") String intersectsWkt,
-            @Param("intersectsWktSRID") Integer intersectsWktSRID);
+    List<Integer> intersectsTableWkt(
+            @Param("tableName") String tableName,
+            @Param("tableIds") List<String> tableIds,
+            @Param("ewkt") String ewkt);
 
     /**
      * table中与wkt数据取交集

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

@@ -13,19 +13,15 @@ public interface AnalyseUtilsDBService {
     /**
      * table中与wkt数据是否有交集
      *
-     * @param inputTable        TABLE名称（vater空间中表）
-     * @param inputSRID         table
-     * @param inputIds          查询数据集ID
-     * @param intersectsWkt     wkt
-     * @param intersectsWktSRID wkt对应的坐标
+     * @param tableName        TABLE名称（vater空间中表）
+     * @param tableIds          查询数据集ID
+     * @param ewkt     wkt
      * @return
      */
-    List<String> intersectsTableWkt(
-            String inputTable,
-            Integer inputSRID,
-            List<String> inputIds,
-            String intersectsWkt,
-            Integer intersectsWktSRID);
+    List<Integer> intersectsTableWkt(
+            String tableName,
+            List<String> tableIds,
+            String ewkt);
 
     /**
      * table中与wkt数据取交集
@@ -49,49 +45,51 @@ public interface AnalyseUtilsDBService {
     /**
      * 计算wkt包含table中的数据，返回table id
      *
-     * @param inputTable  TABLE名称（vater空间中表）
-     * @param inputIds    查询数据集ID
-     * @param ewkt wkt
+     * @param tableName TABLE名称（vater空间中表）
+     * @param tableIds  查询数据集ID
+     * @param ewkt      wkt
      * @return
      */
     List<Integer> containsTableWkt(
-            String inputTable,
-            List<String> inputIds,
+            String tableName,
+            List<String> tableIds,
             String ewkt);
 
     /**
      * 计算TableA包含TableB中的数据，返回tableB id
      *
-     * @param inputTableA
-     * @param inputIdsB
+     * @param tableNameA
+     * @param tableNameB
      * @return
      */
     List<Integer> containsTables(
-            String inputTableA,
-            String inputTableB,
-            List<String> inputIdsB);
+            String tableNameA,
+            String tableNameB,
+            List<String> tableIdsB);
+
     /**
      * 计算wkt距离范围内table中的数据，返回table id
      *
-     * @param inputTable  TABLE名称（vater空间中表）
-     * @param inputIds    查询数据集ID
-     * @param ewkt wkt
+     * @param inputTable TABLE名称（vater空间中表）
+     * @param inputIds   查询数据集ID
+     * @param ewkt       wkt
      * @return
      */
     List<Integer> distanceTableWkt(String inputTable,
-                                  List<String> inputIds,
-                                  String ewkt,
-                                  Integer distance);
+                                   List<String> inputIds,
+                                   String ewkt,
+                                   Integer distance);
+
     /**
      * 计算TableA距离范围内TableB中的数据，返回tableB id
      *
-     * @param inputTableA
-     * @param inputIdsB
+     * @param tableNameA
+     * @param tableNameB
      * @return
      */
     List<Integer> distanceTables(
-            String inputTableA,
-            String inputTableB,
-            List<String> inputIdsB,
+            String tableNameA,
+            String tableNameB,
+            List<String> tableIdsB,
             Integer distance);
 }

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

@@ -16,8 +16,8 @@ public class AnalyseUtilsDBServiceImpl implements AnalyseUtilsDBService {
     private AnalyseUtilsDBMapper analyseUtilsDBMapper;
 
     @Override
-    public List<String> intersectsTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectsWkt, Integer intersectsWktSRID) {
-        return analyseUtilsDBMapper.intersectsTableWkt(inputTable, inputSRID, inputIds, intersectsWkt, intersectsWktSRID);
+    public List<Integer> intersectsTableWkt(String tableName, List<String> tableIds, String ewkt) {
+        return analyseUtilsDBMapper.intersectsTableWkt(tableName, tableIds, ewkt);
     }
 
     @Override
@@ -37,7 +37,7 @@ public class AnalyseUtilsDBServiceImpl implements AnalyseUtilsDBService {
 
     @Override
     public List<Integer> distanceTableWkt(String tableName, List<String> tableIds, String ewkt, Integer distance) {
-         return analyseUtilsDBMapper.distanceTableWkt(tableName, tableIds, ewkt, distance);
+        return analyseUtilsDBMapper.distanceTableWkt(tableName, tableIds, ewkt, distance);
     }
 
     @Override

onemap-modules/onemap-analyse/src/main/resources/bootstrap.yml

@@ -20,7 +20,7 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址

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

@@ -4,41 +4,16 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.onemap.analyse.mapper.AnalyseUtilsDBMapper">
 
-    <select id="intersectsTableWkt" resultType="String">
+    <select id="intersectsTableWkt" resultType="Integer">
         SELECT id
-        FROM "${inputTable}" inTbale
+        FROM "${tableName}" inTbale
         where public.st_intersects(
-            <choose>
-                <when test="intersectsWktSRID != null and intersectsWktSRID !=''">
-                    public.st_transform(public.st_geomfromewkt(#{intersectsWkt}),#{intersectsWktSRID}),
-                    public.st_transform(
-                        <choose>
-                            <when test="inputSRID != null and inputSRID !=''">
-                                public.st_setsrid(inTbale.geom,#{inputSRID})
-                            </when>
-                            <otherwise>
-                                inTbale.geom
-                            </otherwise>
-                        </choose>
-                        ,#{intersectsWktSRID}
-                    )
-                </when>
-                <otherwise>
-                    public.st_geomfromewkt(#{intersectsWkt}),
-                    <choose>
-                        <when test="inputSRID != null and inputSRID !=''">
-                            public.st_setsrid(inTbale.geom,#{inputSRID})
-                        </when>
-                        <otherwise>
-                            inTbale.geom
-                        </otherwise>
-                    </choose>
-                </otherwise>
-            </choose>
+        public.st_geomfromewkt(#{ewkt}),
+        inTbale.geom
         )
-        <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="id" open="(" close=")" separator=",">#{id}</foreach>
         </if>
     </select>