测试

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

@@ -71,7 +71,7 @@ public class AnalyseUtilsDBController extends BaseController {
      * @param wkt      wkt
      * @return
      */
-    @GetMapping("/contains/table_wkt")
+    @PostMapping("/contains/table_wkt")
     @Slave
     public RequestResult containsTableWkt(@RequestParam(value = "tableName") String tableName,
                                           @RequestParam(value = "tableIds", required = false) List<String> tableIds,

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

@@ -53,7 +53,7 @@ public interface AnalyseUtilsDBMapper {
      * @param ewkt
      * @return
      */
-    List<String> containsTableWkt(
+    List<Integer> containsTableWkt(
             @Param("tableName") String tableName,
             @Param("tableIds") List<String> tableIds,
             @Param("ewkt") String ewkt);

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

@@ -54,7 +54,7 @@ public interface AnalyseUtilsDBService {
      * @param wkt wkt
      * @return
      */
-    List<String> containsTableWkt(
+    List<Integer> containsTableWkt(
             String inputTable,
             List<String> inputIds,
             String wkt);

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

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

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

@@ -95,16 +95,16 @@
     </select>
 
 
-    <select id="containsTableWkt" resultType="String">
+    <select id="containsTableWkt" resultType="Integer">
         SELECT id
         FROM "${tableName}" inTbale
         where public.st_contains(
         public.st_geomfromewkt(#{ewkt}),
         inTbale.geom
         )
-        <if test="tableIds != null and inputIds.size()>0 ">
+        <if test="tableIds != null and tableIds.size()>0 ">
             and (inTbale.id)::VARCHAR in
-            <foreach collection="tableIds" item="id" open="(" close=")" separator=",">#{id}</foreach>
+            <foreach collection="tableIds" item="tableId" open="(" close=")" separator=",">#{tableId}</foreach>
         </if>
     </select>