包含接口测试通过

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

@@ -5,10 +5,7 @@ import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.common.datasource.annotation.Slave;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -71,14 +68,15 @@ public class AnalyseUtilsDBController extends BaseController {
      *
      * @param tableName TABLE名称（vater空间中表）
      * @param tableIds  查询数据集ID
-     * @param ewkt      wkt
+     * @param wkt      wkt
      * @return
      */
-    @PostMapping("/contains/table_wkt")
+    @GetMapping("/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));
+                                          @RequestParam(value = "wkt") String wkt) {
+        return RequestResult.success(analyseUtilsDBService.containsTableWkt(tableName, tableIds, wkt));
     }
 
     /**
@@ -89,7 +87,7 @@ public class AnalyseUtilsDBController extends BaseController {
      * @param tableIdsB
      * @return
      */
-    @PostMapping("/contains/tables")
+    @GetMapping("/contains/tables")
     @Slave
     public RequestResult containsTables(@RequestParam(value = "inputTableA") String tableNameA,
                                         @RequestParam(value = "inputTableB") String tableNameB,
@@ -106,7 +104,7 @@ public class AnalyseUtilsDBController extends BaseController {
      * @param ewkt      wkt
      * @return
      */
-    @PostMapping("/distance/table_wkt")
+    @GetMapping("/distance/table_wkt")
     @Slave
     public RequestResult distanceTableWkt(@RequestParam(value = "tableName") String tableName,
                                           @RequestParam(value = "tableIds", required = false) List<String> tableIds,
@@ -123,7 +121,7 @@ public class AnalyseUtilsDBController extends BaseController {
      * @param inputIdsB
      * @return
      */
-    @PostMapping("/distance/tables")
+    @GetMapping("/distance/tables")
     @Slave
     public RequestResult distanceTables(@RequestParam(value = "inputTableA") String inputTableA,
                                         @RequestParam(value = "inputTableB") String inputTableB,

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

@@ -1,6 +1,5 @@
 package com.onemap.analyse.controller.analyse;
 
-import com.onemap.analyse.service.AnalyseUtilsDBService;
 import com.onemap.analyse.service.CreateUtilsDBService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;

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

@@ -51,13 +51,13 @@ public interface AnalyseUtilsDBService {
      *
      * @param inputTable  TABLE名称（vater空间中表）
      * @param inputIds    查询数据集ID
-     * @param containsWkt wkt
+     * @param wkt wkt
      * @return
      */
     List<String> containsTableWkt(
             String inputTable,
             List<String> inputIds,
-            String containsWkt);
+            String wkt);
 
     /**
      * 计算TableA包含TableB中的数据，返回tableB id

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

@@ -11,7 +11,7 @@ import java.util.Map;
 
 @Service
 public class AnalyseUtilsDBServiceImpl implements AnalyseUtilsDBService {
-
+    String Srid4326 = "SRID=4326;";
     @Autowired
     private AnalyseUtilsDBMapper analyseUtilsDBMapper;
 
@@ -26,7 +26,8 @@ public class AnalyseUtilsDBServiceImpl implements AnalyseUtilsDBService {
     }
 
     @Override
-    public List<String> containsTableWkt(String tableName, List<String> tableIds, String ewkt) {
+    public List<String> 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

@@ -92,12 +92,12 @@
         SELECT id
         FROM "${tableName}" inTbale
         where public.st_contains(
-        inTbale.geom,
-        public.st_geomfromewkt(#{ewkt})
+        public.st_geomfromewkt(#{ewkt}),
+        inTbale.geom
         )
-        <if test="inputIds != null and inputIds.size()>0 ">
+        <if test="tableIds != null and inputIds.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>