修改查询的数据库

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

@@ -3,12 +3,15 @@ package com.onemap.analyse.controller.analyse;
 import com.onemap.analyse.service.AnalyseUtilsDBService;
 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 java.util.List;
+
 /**
  * 基于pgsql里的POSTGIS做的分析组件
  */
@@ -30,10 +33,17 @@ public class AnalyseUtilsDBController extends BaseController {
      * @return
      */
     @PostMapping("/intersects/table_wkt")
-    public RequestResult intersectsTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectsWkt, Integer intersectsWktSRID) {
+    @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数据取交集
      *
@@ -46,7 +56,14 @@ public class AnalyseUtilsDBController extends BaseController {
      * @return
      */
     @PostMapping("/intersection/table_wkt")
-    public RequestResult intersectionTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectionWkt, Integer intersectionWktSRID, List<String> outputColumn) {
+    @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) {
         return RequestResult.success(analyseUtilsDBService.intersectionTableWkt(inputTable, inputSRID, inputIds, intersectionWkt, intersectionWktSRID, outputColumn));
     }