修改规划地块接口

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/gdbh/TGdbhJctbController.java

@@ -2,6 +2,7 @@ package com.onemap.apply.controller.gdbh;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.onemap.common.core.utils.poi.ExcelUtil;
@@ -37,6 +38,16 @@ public class TGdbhJctbController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询耕地保护-检测图标数据空间表列表
+     */
+    @GetMapping("/geom/list")
+    public List<Map<String, Object>> geomList(TGdbhJctb tGdbhJctb) {
+        List<Map<String, Object>> list = tGdbhJctbService.selectTGdbhJctbGeomList(tGdbhJctb);
+        return list;
+    }
+
+
     /**
      * 导出耕地保护-检测图标数据详情表列表
      */

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/TGdbhJctbMapper.java

@@ -1,6 +1,8 @@
 package com.onemap.apply.mapper.gdbh;
 
 import java.util.List;
+import java.util.Map;
+
 import com.onemap.apply.domain.gdbh.TGdbhJctb;
 
 /**
@@ -27,6 +29,13 @@ public interface TGdbhJctbMapper
      */
     public List<TGdbhJctb> selectTGdbhJctbList(TGdbhJctb tGdbhJctb);
 
+    /**
+     * 查询耕地保护-检测图标数据空间列表
+     * @param tGdbhJctb
+     * @return
+     */
+    public List<Map<String,Object>> selectTGdbhJctbGeomList(TGdbhJctb tGdbhJctb);
+
     /**
      * 新增耕地保护-检测图标数据详情表
      * 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/ITGdbhJctbService.java

@@ -29,6 +29,13 @@ public interface ITGdbhJctbService {
      */
     public List<TGdbhJctb> selectTGdbhJctbList(TGdbhJctb tGdbhJctb);
 
+    /**
+     * 查询耕地保护-检测图标数据空间列表
+     * @param tGdbhJctb
+     * @return
+     */
+    public List<Map<String,Object>> selectTGdbhJctbGeomList(TGdbhJctb tGdbhJctb);
+
     /**
      * 新增耕地保护-检测图标数据详情表
      *

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhJctbServiceImpl.java

@@ -4,10 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
@@ -68,6 +65,16 @@ public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
         return tGdbhJctbMapper.selectTGdbhJctbList(tGdbhJctb);
     }
 
+    /**
+     * 查询耕地保护-检测图标数据空间列表
+     * @param tGdbhJctb
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectTGdbhJctbGeomList(TGdbhJctb tGdbhJctb) {
+        return tGdbhJctbMapper.selectTGdbhJctbGeomList(tGdbhJctb);
+    }
+
     /**
      * 新增耕地保护-检测图标数据详情表
      *

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/TGdbhJctbMapper.xml

@@ -79,6 +79,18 @@
         </where>
     </select>
 
+    <select id="selectTGdbhJctbGeomList" parameterType="TGdbhJctb" resultType="map">
+        select id,public.st_asewkt(geom) geom from t_gdbh_jctb
+        <where>
+            <if test="jcbh != null  and jcbh != ''">and jcbh like concat('%',#{jcbh},'%')</if>
+            <if test="regioncode != null  and regioncode != ''">and regioncode like concat(#{regioncode},'%')</if>
+            <if test="hlx != null  and hlx != ''">and hlx = #{hlx}</if>
+            <if test="startTime != null ">and to_date(hsx , 'YYYYMMDD') &gt;= #{startTime}</if>
+            <if test="endTime != null ">and to_date(hsx , 'YYYYMMDD') &lt;= #{endTime}</if>
+        </where>
+
+    </select>
+
     <select id="selectTGdbhJctbById" parameterType="String" resultMap="TGdbhJctbResult">
         <include refid="selectTGdbhJctbVo"/>
         where id = #{id}