宗地图斑查询2

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -295,7 +295,7 @@ public class CadastreManageController extends BaseController {
                                                        @RequestParam(value = "bdcdyh",required = false,defaultValue = "") String bdcdyh,
                                                        @RequestParam(value = "zl",required = false,defaultValue = "") String zl,
                                                        @RequestParam(value = "qlr",required = false,defaultValue = "") String qlr,
-                                                       @RequestParam(value = "cxfw",required = false,defaultValue = "") String cxfw,
+                                                       @RequestParam(value = "shape",required = false,defaultValue = "") String cxfw,
                                                        @RequestParam(value = "bsm",required = false,defaultValue = "") String bsm,
                                                        @RequestParam(value = "ywh",required = false,defaultValue = "") String ywh) {
 
@@ -314,21 +314,13 @@ public class CadastreManageController extends BaseController {
             }else {
                     ywh +=  " AND zl like '%" + zl + "%'";
             }
-
             if (StringUtils.isNotBlank(cxfw)) {
                 if (!cxfw.contains("SRID=")) {
                     cxfw = "SRID=" + "4326" + ";" + cxfw;
                 }
                 //todo 这里根据不同的表使用图形查询交集，然后获取bsm，拼接ywh
+                ywh += " AND public.st_intersects(geom,public.st_geomfromewkt("+cxfw+"))";
             }
-
-
-
-
-
-
-
-
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);
             return R.ok(res);
         } catch (Exception e) {