调整关于地籍校验

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

@@ -261,7 +261,7 @@ public class CadastreManageController extends BaseController {
      * @return
      */
     @GetMapping("/selectTableList")
-    public R<List<Map<String,Object>>> selectTableRow(@RequestParam("tableName") String tableName,@RequestParam("geomFlag") String geomFlag,@RequestParam("bsm") String bsm,@RequestParam("ywh") String ywh) {
+    public R<List<Map<String,Object>>> selectTableRow(@RequestParam("tableName") String tableName,@RequestParam("geomFlag") String geomFlag,@RequestParam("bsm") String bsm, @RequestParam(value = "ywh",required = false,defaultValue = "1=1") String ywh) {
         try {
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);
             return R.ok(res);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/CadastreFileMapper.java

@@ -99,6 +99,8 @@ public interface CadastreFileMapper {
 
     List<Map<String,Object>> selectTableDataByCondition(@Param("validFlag") String validFlag, @Param("tableName") String tableName,@Param("bsm") String bsm,@Param("ywh") String ywh);
 
+    //获取相交的数据
+    List<Map<String,Object>> intersectsTableWkt(@Param("tableName") String tableName, @Param("validFlag") String validFlag, @Param("ewkt") String ewkt);
 
 
 }

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/CadastreFileMapper.xml

@@ -331,5 +331,15 @@
         </foreach>
     </delete>
 
+    <select id="intersectsTableWkt" resultType="Map">
+        SELECT *
+        FROM "${tableName}" inTbale
+        where public.st_intersects(inTbale.geom,public.st_geomfromewkt(#{ewkt}))
+          <if test="validFlag != null and validFlag != ''">
+            and valid_flag = ${validFlag}
+        </if>
+    </select>
+
+
 
 </mapper>