三亚中图代码合并

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/SanYaController.java

@@ -101,7 +101,7 @@ public class SanYaController extends BaseController {
 
 
             List<PicData> picList = new ArrayList<>();
-            if(!benchmarkLandPriceReport.getPicBase64List().isEmpty()){
+            if(benchmarkLandPriceReport.getPicBase64List()!=null&&!benchmarkLandPriceReport.getPicBase64List().isEmpty()){
                 ObjectMapper objectMapper=new ObjectMapper();
                 List<String> picBase64List=objectMapper.readValue(benchmarkLandPriceReport.getPicBase64List(), new TypeReference<List<String>>(){});
 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtZdProjectListController.java

@@ -106,9 +106,15 @@ public class ZtZdProjectListController extends BaseController
                 return;
             }
             List<PicData> picList = new ArrayList<>();
-//            List<String> picBase64List = Arrays.asList(ztZdProjectList.getImageData().split(","));
-            ObjectMapper objectMapper=new ObjectMapper();
-            List<String> picBase64List=objectMapper.readValue(ztZdProjectList.getImageData(), new TypeReference<List<String>>(){});
+////            List<String> picBase64List = Arrays.asList(ztZdProjectList.getImageData().split(","));
+//            ObjectMapper objectMapper=new ObjectMapper();
+//            List<String> picBase64List=objectMapper.readValue(ztZdProjectList.getImageData(), new TypeReference<List<String>>(){});
+            List<String> picBase64List=new ArrayList<>();
+            if(!ztZdProjectList.getImageData().isEmpty()){
+                picBase64List.add(ztZdProjectList.getImageData());
+
+            }
+
 
             //将base64图片转为PictureRenderData
             for (String base64ImageData:picBase64List) {

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/Center.java

@@ -0,0 +1,25 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Auto-generated: 2024-08-30 16:9:43
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Center {
+
+    private double x;
+    private double y;
+
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/Data.java

@@ -0,0 +1,25 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+/**
+ * Auto-generated: 2024-08-30 16:9:43
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@lombok.Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Data {
+
+    private String label;
+    private String labelCN;
+    private String value;
+
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/Date_server.java

@@ -0,0 +1,54 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+
+/**
+ * Auto-generated: 2024-09-02 11:47:39
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class Date_server {
+
+    private String nvfid;
+    private String server_name;
+    private String url;
+    private String datasourcename;
+    private String datasetname;
+    public void setNvfid(String nvfid) {
+         this.nvfid = nvfid;
+     }
+     public String getNvfid() {
+         return nvfid;
+     }
+
+    public void setServer_name(String server_name) {
+         this.server_name = server_name;
+     }
+     public String getServer_name() {
+         return server_name;
+     }
+
+    public void setUrl(String url) {
+         this.url = url;
+     }
+     public String getUrl() {
+         return url;
+     }
+
+    public void setDatasourcename(String datasourcename) {
+         this.datasourcename = datasourcename;
+     }
+     public String getDatasourcename() {
+         return datasourcename;
+     }
+
+    public void setDatasetname(String datasetname) {
+         this.datasetname = datasetname;
+     }
+     public String getDatasetname() {
+         return datasetname;
+     }
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/GHDKInfo.java

@@ -0,0 +1,48 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+import java.util.List;
+
+/**
+ * Auto-generated: 2024-09-02 11:47:39
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class GHDKInfo {
+
+    private String id;
+    private List<Data> data;
+    private Geometry geometry;
+    private List<layerData> JZDJList;
+    private  List<ZytdList> zytdList;
+    public void setId(String id) {
+         this.id = id;
+     }
+     public String getId() {
+         return id;
+     }
+    public void setData(List<Data> data) {
+         this.data = data;
+     }
+     public List<Data> getData() {
+         return data;
+     }
+
+    public void setGeometry(Geometry geometry) {
+         this.geometry = geometry;
+     }
+     public Geometry getGeometry() {
+         return geometry;
+     }
+
+     public void setJZDJList(List<layerData> JZDJList) {this.JZDJList = JZDJList;}
+
+    public List<layerData> getJZDJList() {
+        return JZDJList;
+    }
+
+    public void setZytdList(List<ZytdList> zytdList) {this.zytdList = zytdList;}
+    public List<ZytdList> getZytdList() {return zytdList;}
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/GHDKType.java

@@ -0,0 +1,23 @@
+
+package com.onemap.sanya.domain.JZDJ;
+
+
+public class GHDKType {
+
+    private String ydxz;
+    private String ydxzdl;
+    public void setYdxz(String ydxz) {
+         this.ydxz = ydxz;
+     }
+     public String getYdxz() {
+         return ydxz;
+     }
+
+    public void setYdxzdl(String ydxzdl) {
+         this.ydxzdl = ydxzdl;
+     }
+     public String getYdxzdl() {
+         return ydxzdl;
+     }
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/Geometry.java

@@ -0,0 +1,32 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * Auto-generated: 2024-08-30 16:9:43
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Geometry {
+
+    private Center center;
+    private List<Integer> parts;
+    private String style;
+    private String prjCoordSys;
+    private int id;
+    private String type;
+    private List<Integer> partTopo;
+    private List<Points> points;
+    private String WKTstr;
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/GhdkDetailed.java

@@ -0,0 +1,27 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * Auto-generated: 2024-08-30 16:9:43
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@lombok.Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GhdkDetailed {
+
+    private String id;
+    private Geometry geometry;
+    private List<Data> data;
+    private String ghyt;
+    private String dkbm;
+    private List<ZytdList> zytdList;
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/Layerinfo.java

@@ -0,0 +1,55 @@
+
+package com.onemap.sanya.domain.JZDJ;
+
+
+public class Layerinfo {
+    private String tableName;
+    private String layerCore;
+    private String tdjbField;
+    private String ydlxTypeField;
+    private String ydlxPriceField;
+    private String qsTYPE;
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setLayerCore(String layerCore) {
+         this.layerCore = layerCore;
+     }
+     public String getLayerCore() {
+         return layerCore;
+     }
+
+    public void setTdjbField(String tdjbField) {
+         this.tdjbField = tdjbField;
+     }
+     public String getTdjbField() {
+         return tdjbField;
+     }
+
+    public void setYdlxTypeField(String ydlxTypeField) {
+         this.ydlxTypeField = ydlxTypeField;
+     }
+     public String getYdlxTypeField() {
+         return ydlxTypeField;
+     }
+
+    public void setYdlxPriceField(String ydlxPriceField) {
+         this.ydlxPriceField = ydlxPriceField;
+     }
+     public String getYdlxPriceField() {
+         return ydlxPriceField;
+     }
+
+    public void setQsTYPE(String qsTYPE) {
+         this.qsTYPE = qsTYPE;
+     }
+     public String getQsTYPE() {
+         return qsTYPE;
+     }
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/Points.java

@@ -0,0 +1,24 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Auto-generated: 2024-08-30 16:9:43
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Points {
+
+    private double x;
+    private double y;
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/Server.java

@@ -0,0 +1,54 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+
+/**
+ * Auto-generated: 2024-09-02 11:47:39
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class Server {
+
+    private String nvfid;
+    private String server_name;
+    private String url;
+    private String scene;
+    private String layer;
+    public void setNvfid(String nvfid) {
+         this.nvfid = nvfid;
+     }
+     public String getNvfid() {
+         return nvfid;
+     }
+
+    public void setServer_name(String server_name) {
+         this.server_name = server_name;
+     }
+     public String getServer_name() {
+         return server_name;
+     }
+
+    public void setUrl(String url) {
+         this.url = url;
+     }
+     public String getUrl() {
+         return url;
+     }
+
+    public void setScene(String scene) {
+         this.scene = scene;
+     }
+     public String getScene() {
+         return scene;
+     }
+
+    public void setLayer(String layer) {
+         this.layer = layer;
+     }
+     public String getLayer() {
+         return layer;
+     }
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/ZytdList.java

@@ -0,0 +1,29 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * Auto-generated: 2024-08-30 16:9:43
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@lombok.Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ZytdList {
+
+    private List<Data> data;
+    private Double area;
+    private String tdjb;
+    private Double dj;
+    private Double zdj;
+    private Geometry geometry;
+
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/landUseNatureRelation.java

@@ -0,0 +1,39 @@
+
+package com.onemap.sanya.domain.JZDJ;
+import java.util.List;
+
+
+public class landUseNatureRelation {
+
+    private String tdyt;
+    private List<GHDKType> GHDKType;
+    private List<Layerinfo> layerinfo;
+    private List<landUseNatureRelation> children;
+    public void setTdyt(String tdyt) {
+         this.tdyt = tdyt;
+     }
+     public String getTdyt() {
+         return tdyt;
+     }
+
+    public void setGHDKType(List<GHDKType> GHDKType) {
+         this.GHDKType = GHDKType;
+     }
+     public List<GHDKType> getGHDKType() {
+         return GHDKType;
+     }
+
+    public void setLayerinfo(List<Layerinfo> layerinfo) {
+         this.layerinfo = layerinfo;
+     }
+     public List<Layerinfo> getLayerinfo() {
+         return layerinfo;
+     }
+
+    public void setChildren(List<landUseNatureRelation> children) {
+        this.children = children;
+    }
+    public List<landUseNatureRelation> getChildren() {
+        return children;
+    }
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJ/layerData.java

@@ -0,0 +1,44 @@
+/**
+  * Copyright 2024 bejson.com 
+  */
+package com.onemap.sanya.domain.JZDJ;
+import java.util.List;
+
+/**
+ * Auto-generated: 2024-09-02 11:47:39
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class layerData {
+
+    private String id;
+    private List<Data> data;
+    private Geometry geometry;
+    private Layerinfo layerInfo;
+    public void setId(String id) {
+         this.id = id;
+     }
+     public String getId() {
+         return id;
+     }
+    public void setData(List<Data> data) {
+         this.data = data;
+     }
+     public List<Data> getData() {
+         return data;
+     }
+
+    public void setGeometry(Geometry geometry) {
+         this.geometry = geometry;
+     }
+     public Geometry getGeometry() {
+         return geometry;
+     }
+
+     public void setlayerInfo(Layerinfo layerInfo) {this.layerInfo = layerInfo;}
+
+    public Layerinfo getlayerInfo() {
+        return layerInfo;
+    }
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/spatial/C41Gfjb.java

@@ -25,8 +25,8 @@ public class C41Gfjb extends BaseEntity
     /** smid */
     private Integer smid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** smuserid */
+    @Excel(name = "smuserid")
     private Integer smuserid;
 
     /** 面积 */
@@ -41,17 +41,17 @@ public class C41Gfjb extends BaseEntity
     @Excel(name = "范围坐标")
     private String smgeometry;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** objectid */
+    @Excel(name = "objectid")
     private Integer objectid;
 
     /** 土地级别 */
     @Excel(name = "土地级别")
-    @JsonProperty("公园与绿地、公用设施用地")
+    @JsonProperty("土地级别")
     private String 土地级别;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** qpbh */
+    @Excel(name = "qpbh")
     private String qpbh;
 
     /** 新闻出版用地 */

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/C12SfjbMapper.java

@@ -2,6 +2,7 @@ package com.onemap.sanya.mapper.spatial;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.C12Sfjb;
+import com.onemap.sanya.domain.spatial.C22Zzjb;
 
 /**
  * c1_2_商服级别Mapper接口
@@ -27,6 +28,13 @@ public interface C12SfjbMapper
      */
     public List<C12Sfjb> selectC12SfjbList(C12Sfjb c12Sfjb);
 
+    /**
+     * 查询 多边形相交的 数据
+     * @param polygon
+     * @return
+     */
+    public List<C12Sfjb> selectByPolygon(String polygon);
+
     /**
      * 新增c1_2_商服级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/C22ZzjbMapper.java

@@ -2,6 +2,7 @@ package com.onemap.sanya.mapper.spatial;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.C22Zzjb;
+import com.onemap.sanya.domain.spatial.C32Gyjb;
 
 /**
  * c2_2_住宅级别Mapper接口
@@ -27,6 +28,13 @@ public interface C22ZzjbMapper
      */
     public List<C22Zzjb> selectC22ZzjbList(C22Zzjb c22Zzjb);
 
+    /**
+     * 查询 多边形相交的 数据
+     * @param polygon
+     * @return
+     */
+    public List<C22Zzjb> selectByPolygon(String polygon);
+
     /**
      * 新增c2_2_住宅级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/C32GyjbMapper.java

@@ -2,6 +2,7 @@ package com.onemap.sanya.mapper.spatial;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.C32Gyjb;
+import com.onemap.sanya.domain.spatial.C41Gfjb;
 
 /**
  * c3_2_工业级别Mapper接口
@@ -27,6 +28,13 @@ public interface C32GyjbMapper
      */
     public List<C32Gyjb> selectC32GyjbList(C32Gyjb c32Gyjb);
 
+    /**
+     * 查询 多边形相交的 数据
+     * @param polygon
+     * @return
+     */
+    public List<C32Gyjb> selectByPolygon(String polygon);
+
     /**
      * 新增c3_2_工业级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/C41GfjbMapper.java

@@ -2,6 +2,7 @@ package com.onemap.sanya.mapper.spatial;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.C41Gfjb;
+import com.onemap.sanya.domain.spatial.Ghdk;
 
 /**
  * c4_1_公服级别Mapper接口
@@ -27,6 +28,14 @@ public interface C41GfjbMapper
      */
     public List<C41Gfjb> selectC41GfjbList(C41Gfjb c41Gfjb);
 
+    /**
+     * 查询 多边形相交的 数据
+     * @param polygon
+     * @return
+     */
+    public List<C41Gfjb> selectByPolygon(String polygon);
+
+
     /**
      * 新增c4_1_公服级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IC12SfjbService.java

@@ -2,6 +2,7 @@ package com.onemap.sanya.service;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.C12Sfjb;
+import com.onemap.sanya.domain.spatial.Ghdk;
 
 /**
  * c1_2_商服级别Service接口
@@ -27,6 +28,14 @@ public interface IC12SfjbService
      */
     public List<C12Sfjb> selectC12SfjbList(C12Sfjb c12Sfjb);
 
+    /**
+     * 获取范围下的列表
+     * @param polygon
+     * @return
+     */
+    public List<C12Sfjb> selectByPolygon(String polygon);
+
+
     /**
      * 新增c1_2_商服级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IC22ZzjbService.java

@@ -2,6 +2,7 @@ package com.onemap.sanya.service;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.C22Zzjb;
+import com.onemap.sanya.domain.spatial.Ghdk;
 
 /**
  * c2_2_住宅级别Service接口
@@ -27,6 +28,14 @@ public interface IC22ZzjbService
      */
     public List<C22Zzjb> selectC22ZzjbList(C22Zzjb c22Zzjb);
 
+    /**
+     * 获取范围下的列表
+     * @param polygon
+     * @return
+     */
+    public List<C22Zzjb> selectByPolygon(String polygon);
+
+
     /**
      * 新增c2_2_住宅级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IC32GyjbService.java

@@ -2,6 +2,7 @@ package com.onemap.sanya.service;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.C32Gyjb;
+import com.onemap.sanya.domain.spatial.Ghdk;
 
 /**
  * c3_2_工业级别Service接口
@@ -27,6 +28,14 @@ public interface IC32GyjbService
      */
     public List<C32Gyjb> selectC32GyjbList(C32Gyjb c32Gyjb);
 
+    /**
+     * 获取范围下的列表
+     * @param polygon
+     * @return
+     */
+    public List<C32Gyjb> selectByPolygon(String polygon);
+
+
     /**
      * 新增c3_2_工业级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IC41GfjbService.java

@@ -2,6 +2,7 @@ package com.onemap.sanya.service;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.C41Gfjb;
+import com.onemap.sanya.domain.spatial.Ghdk;
 
 /**
  * c4_1_公服级别Service接口
@@ -27,6 +28,14 @@ public interface IC41GfjbService
      */
     public List<C41Gfjb> selectC41GfjbList(C41Gfjb c41Gfjb);
 
+    /**
+     * 获取范围下的列表
+     * @param polygon
+     * @return
+     */
+    public List<C41Gfjb> selectByPolygon(String polygon);
+
+
     /**
      * 新增c4_1_公服级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/C12SfjbServiceImpl.java

@@ -1,6 +1,8 @@
 package com.onemap.sanya.service.impl;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.C22Zzjb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.onemap.sanya.mapper.spatial.C12SfjbMapper;
@@ -43,6 +45,17 @@ public class C12SfjbServiceImpl implements IC12SfjbService
         return c12SfjbMapper.selectC12SfjbList(c12Sfjb);
     }
 
+    /**
+     * 获取范围下的列表
+     * @param polygon wkt 多边形
+     * @return
+     */
+    @Override
+    public List<C12Sfjb> selectByPolygon(String polygon)
+    {
+        return c12SfjbMapper.selectByPolygon(polygon);
+    }
+
     /**
      * 新增c1_2_商服级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/C22ZzjbServiceImpl.java

@@ -1,6 +1,8 @@
 package com.onemap.sanya.service.impl;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.C32Gyjb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.onemap.sanya.mapper.spatial.C22ZzjbMapper;
@@ -43,6 +45,17 @@ public class C22ZzjbServiceImpl implements IC22ZzjbService
         return c22ZzjbMapper.selectC22ZzjbList(c22Zzjb);
     }
 
+    /**
+     * 获取范围下的列表
+     * @param polygon wkt 多边形
+     * @return
+     */
+    @Override
+    public List<C22Zzjb> selectByPolygon(String polygon)
+    {
+        return c22ZzjbMapper.selectByPolygon(polygon);
+    }
+
     /**
      * 新增c2_2_住宅级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/C32GyjbServiceImpl.java

@@ -1,6 +1,8 @@
 package com.onemap.sanya.service.impl;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.C41Gfjb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.onemap.sanya.mapper.spatial.C32GyjbMapper;
@@ -43,6 +45,17 @@ public class C32GyjbServiceImpl implements IC32GyjbService
         return c32GyjbMapper.selectC32GyjbList(c32Gyjb);
     }
 
+    /**
+     * 获取范围下的列表
+     * @param polygon wkt 多边形
+     * @return
+     */
+    @Override
+    public List<C32Gyjb> selectByPolygon(String polygon)
+    {
+        return c32GyjbMapper.selectByPolygon(polygon);
+    }
+
     /**
      * 新增c3_2_工业级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/C41GfjbServiceImpl.java

@@ -1,6 +1,8 @@
 package com.onemap.sanya.service.impl;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.Ghdk;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.onemap.sanya.mapper.spatial.C41GfjbMapper;
@@ -43,6 +45,17 @@ public class C41GfjbServiceImpl implements IC41GfjbService
         return c41GfjbMapper.selectC41GfjbList(c41Gfjb);
     }
 
+    /**
+     * 获取范围下的列表
+     * @param polygon wkt 多边形
+     * @return
+     */
+    @Override
+    public List<C41Gfjb> selectByPolygon(String polygon)
+    {
+        return c41GfjbMapper.selectByPolygon(polygon);
+    }
+
     /**
      * 新增c4_1_公服级别
      * 

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/GhdkServiceImpl.java

@@ -50,6 +50,7 @@ public class GhdkServiceImpl implements IGhdkService
      * @param polygon wkt 多边形
      * @return
      */
+    @Override
     public List<Ghdk> selectByPolygon(String polygon)
     {
         return ghdkMapper.selectByPolygon(polygon);

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/utils/SpatialOperate.java

@@ -1,18 +1,27 @@
 package com.onemap.sanya.utils;
 
+import com.onemap.common.core.annotation.Excel;
 import com.onemap.sanya.domain.spatial.CustomXY;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.FldInfo;
+import org.geotools.geojson.GeoJSON;
 import org.geotools.geometry.jts.JTS;
+import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.geotools.util.factory.Hints;
 
 import org.locationtech.jts.geom.*;
 
-import  org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.Polygon;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.io.WKTReader;
 import org.locationtech.jts.io.WKTWriter;
-import  org.geotools.referencing.CRS;
+import org.geotools.referencing.CRS;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.operation.MathTransform;
@@ -22,14 +31,78 @@ public class SpatialOperate {
 //    static GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory(hints);
 
 
-    static PrecisionModel precisionModel = new PrecisionModel(PrecisionModel.FIXED);
+    static PrecisionModel precisionModel = new PrecisionModel(PrecisionModel.FLOATING);
 
     // 定义一个坐标参考系统，这里使用EPSG:4326，即WGS84
     static final int srid = 4490;
+    static String srid4326 = "GEOGCS[\"WGS 84\",\n" +
+            "    DATUM[\"WGS_1984\",\n" +
+            "        SPHEROID[\"WGS 84\",6378137,298.257223563,\n" +
+            "            AUTHORITY[\"EPSG\",\"7030\"]],\n" +
+            "        AUTHORITY[\"EPSG\",\"6326\"]],\n" +
+            "    PRIMEM[\"Greenwich\",0,\n" +
+            "        AUTHORITY[\"EPSG\",\"8901\"]],\n" +
+            "    UNIT[\"degree\",0.0174532925199433,\n" +
+            "        AUTHORITY[\"EPSG\",\"9122\"]],\n" +
+            "    AUTHORITY[\"EPSG\",\"4326\"]]";
+    static String srid3857 = "PROJCS[\"WGS 84 / Pseudo-Mercator\",\n" +
+            "    GEOGCS[\"WGS 84\",\n" +
+            "        DATUM[\"WGS_1984\",\n" +
+            "            SPHEROID[\"WGS 84\",6378137,298.257223563,\n" +
+            "                AUTHORITY[\"EPSG\",\"7030\"]],\n" +
+            "            AUTHORITY[\"EPSG\",\"6326\"]],\n" +
+            "        PRIMEM[\"Greenwich\",0,\n" +
+            "            AUTHORITY[\"EPSG\",\"8901\"]],\n" +
+            "        UNIT[\"degree\",0.0174532925199433,\n" +
+            "            AUTHORITY[\"EPSG\",\"9122\"]],\n" +
+            "        AUTHORITY[\"EPSG\",\"4326\"]],\n" +
+            "    PROJECTION[\"Mercator_1SP\"],\n" +
+            "    PARAMETER[\"central_meridian\",0],\n" +
+            "    PARAMETER[\"scale_factor\",1],\n" +
+            "    PARAMETER[\"false_easting\",0],\n" +
+            "    PARAMETER[\"false_northing\",0],\n" +
+            "    UNIT[\"metre\",1,\n" +
+            "        AUTHORITY[\"EPSG\",\"9001\"]],\n" +
+            "    AXIS[\"Easting\",EAST],\n" +
+            "    AXIS[\"Northing\",NORTH],\n" +
+            "    EXTENSION[\"PROJ4\",\"+proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs\"],\n" +
+            "    AUTHORITY[\"EPSG\",\"3857\"]]";
+    static String srid4490 = "GEOGCS[\"China Geodetic Coordinate System 2000\",\n" +
+            "    DATUM[\"China_2000\",\n" +
+            "        SPHEROID[\"CGCS2000\",6378137,298.257222101,\n" +
+            "            AUTHORITY[\"EPSG\",\"1024\"]],\n" +
+            "        AUTHORITY[\"EPSG\",\"1043\"]],\n" +
+            "    PRIMEM[\"Greenwich\",0,\n" +
+            "        AUTHORITY[\"EPSG\",\"8901\"]],\n" +
+            "    UNIT[\"degree\",0.0174532925199433,\n" +
+            "        AUTHORITY[\"EPSG\",\"9122\"]],\n" +
+            "    AUTHORITY[\"EPSG\",\"4490\"]]";
+    static String srid4546 = "PROJCS[\"CGCS2000 / 3-degree Gauss-Kruger CM 111E\",\n" +
+            "    GEOGCS[\"China Geodetic Coordinate System 2000\",\n" +
+            "        DATUM[\"China_2000\",\n" +
+            "            SPHEROID[\"CGCS2000\",6378137,298.257222101,\n" +
+            "                AUTHORITY[\"EPSG\",\"1024\"]],\n" +
+            "            AUTHORITY[\"EPSG\",\"1043\"]],\n" +
+            "        PRIMEM[\"Greenwich\",0,\n" +
+            "            AUTHORITY[\"EPSG\",\"8901\"]],\n" +
+            "        UNIT[\"degree\",0.0174532925199433,\n" +
+            "            AUTHORITY[\"EPSG\",\"9122\"]],\n" +
+            "        AUTHORITY[\"EPSG\",\"4490\"]],\n" +
+            "    PROJECTION[\"Transverse_Mercator\"],\n" +
+            "    PARAMETER[\"latitude_of_origin\",0],\n" +
+            "    PARAMETER[\"central_meridian\",111],\n" +
+            "    PARAMETER[\"scale_factor\",1],\n" +
+            "    PARAMETER[\"false_easting\",500000],\n" +
+            "    PARAMETER[\"false_northing\",0],\n" +
+            "    UNIT[\"metre\",1,\n" +
+            "        AUTHORITY[\"EPSG\",\"9001\"]],\n" +
+            "    AUTHORITY[\"EPSG\",\"4546\"]]";
+
 
     // 创建GeometryFactory
     static GeometryFactory geometryFactory = new GeometryFactory(precisionModel, srid);
 
+
     public static Polygon createPolygonByXYArray(List<CustomXY> coors) {
 
         Polygon pPolygon = null;
@@ -37,21 +110,29 @@ public class SpatialOperate {
             return pPolygon;
         Coordinate[] coordinates = new Coordinate[]{new Coordinate(1, 2), new Coordinate(1, 2), new Coordinate(1, 2)};
         pPolygon = geometryFactory.createPolygon();
-        geometryFactory.getSRID();
 
         return pPolygon;
     }
-    public  static  String geometry2Wkt(Geometry geometry)
-    {
-        String wkt="";
-        WKTWriter wktWriter=new WKTWriter();
-        wkt=  wktWriter.write(geometry);
-        return  wkt;
+
+    public static String geometry2Wkt(Geometry geometry) {
+        String wkt = "SRID=" + srid + ";";
+        WKTWriter wktWriter = new WKTWriter();
+        wkt += wktWriter.write(geometry);
+        return wkt;
+
+    }
+
+    public static String geometry2GeoJson(Geometry geometry) throws IOException {
+        String wkt = "";
+        GeoJSON.write(geometry, wkt);
+        return wkt;
 
     }
+
     public static Point createPoint(Double x, Double y) {
         return geometryFactory.createPoint(new Coordinate(x, y));
     }
+
     /**
      * 根据坐标点创建
      *
@@ -62,28 +143,33 @@ public class SpatialOperate {
         Polygon polygon = null;
         if (points == null)
             return polygon;
+
         Coordinate[] coordinates = points.toArray(new Coordinate[points.size()]);
-        polygon = geometryFactory.createPolygon(coordinates);
+        LinearRing ring = geometryFactory.createLinearRing(coordinates);
+        polygon = geometryFactory.createPolygon(ring);
+        polygon.setSRID(srid);
         return polygon;
     }
 
     /**
      * 经纬度转墨卡托   便于面积转换
+     *
      * @param geom
      * @return
      */
     public static Geometry lonlat2WebMactor(Geometry geom) {
         try {
             //这里是以OGC WKT形式定义的是World Mercator投影，网页地图一般使用该投影
-            Integer crid = geom.getSRID();
-            if (crid == 0)
-                crid = srid;
-            CoordinateReferenceSystem sourceTarget = CRS.decode("EPSG:" + crid.toString());
-            CoordinateReferenceSystem crsTarget = CRS.decode("EPSG:4546");
 
+            CoordinateReferenceSystem sourceTarget = CRS.parseWKT(srid4490);
+
+//            MathTransform transform1 = CRS.findMathTransform(DefaultGeographicCRS.WGS84, sourceTarget);
+//            Geometry geometry1= JTS.transform(geom, transform1);
             // 投影转换
-            MathTransform transform = CRS.findMathTransform(sourceTarget, crsTarget);
-            return JTS.transform(geom, transform);
+            CoordinateReferenceSystem crsTarget = CRS.parseWKT(srid4546);
+
+            MathTransform transform2 = CRS.findMathTransform(sourceTarget, crsTarget, false);
+            return JTS.transform(geom, transform2);
         } catch (Exception e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -93,10 +179,11 @@ public class SpatialOperate {
 
     /**
      * 获取面积（平方米）
+     *
      * @param geometry
      * @return
      */
-    public  static Double  getGeometryArea(Geometry geometry) {
+    public static Double getGeometryArea(Geometry geometry) {
         if (geometry == null)
             return 0.00;
         Geometry geometry1 = lonlat2WebMactor(geometry);
@@ -105,19 +192,39 @@ public class SpatialOperate {
         return geometry1.getArea();
     }
 
-        /**
-         * 根据wkt 生成多边形
-         *
-         * @param wkt
-         * @return
-         * @throws ParseException
-         */
+    /**
+     * 根据wkt 生成多边形
+     *
+     * @param wkt
+     * @return
+     * @throws ParseException
+     */
     public static Polygon createPolygonByWkt(String wkt) throws ParseException, org.locationtech.jts.io.ParseException {
         WKTReader reader = new WKTReader();
+        Integer index = wkt.indexOf(";");
+        if (index > -1)
+            wkt = wkt.substring(index + 1);
         Polygon geometry = (Polygon) reader.read(wkt);
         return geometry;
     }
 
+    /**
+     * 根据wkt 生成多边形
+     *
+     * @param wkt
+     * @return
+     * @throws ParseException
+     */
+    public static Geometry createGeometryByWkt(String wkt) throws ParseException, org.locationtech.jts.io.ParseException {
+        WKTReader reader = new WKTReader();
+        Integer index = wkt.indexOf(";");
+        if (index > -1)
+            wkt = wkt.substring(index + 1);
+        Geometry geometry =  reader.read(wkt);
+        geometry.setSRID(srid);
+        return geometry;
+    }
+
     public static Double getIntersectsArea(Geometry polygon1, Geometry other) {
         Geometry intersetGeom = (Geometry) polygon1.intersection(other);
         if (intersetGeom == null) {
@@ -126,8 +233,69 @@ public class SpatialOperate {
         Polygon pPolgon = (Polygon) intersetGeom;
         if (pPolgon == null)
             return 0.00;
-        pPolgon= (Polygon) lonlat2WebMactor(pPolgon);
-        return pPolgon.getArea()/666.66;
+        pPolgon = (Polygon) lonlat2WebMactor(pPolgon);
+        return pPolgon.getArea() / 666.66;
+    }
+
+    /**
+     * 计算多个面交集
+     *
+     * @param polygons
+     * @return
+     */
+    public static Double getIntersectByGeometrys(List<Geometry> polygons) {
+
+        Geometry intersetGeom = null;
+        if (polygons.size() >= 2) {
+            for (int i = 1; i < polygons.size(); i++) {
+//                第一次用前两个比较
+                if (i == 1) {
+                    intersetGeom = polygons.get(0).intersection(polygons.get(i));
+                }
+//                后续用上次的结果比较
+                else if (i == polygons.size() - 1) {
+                    intersetGeom = intersetGeom.intersection(polygons.get(i));
+                }
+                // 检查交集是否为空，如果为空则提前结束循环
+                if (intersetGeom.isEmpty()) {
+                    return 0.00;
+                }
+            }
+        }
+        if (!intersetGeom.isEmpty()) {
+            return lonlat2WebMactor(intersetGeom).getArea()/666.66;
+        } else {
+            return 0.00;
+        }
+    }
+
+    /**
+     * 根据类生成字段列表
+     *
+     * @param object
+     * @return
+     */
+    public static List<FldInfo> getFieldAnnotation(Object object) {
+        Field[] fields = object.getClass().getDeclaredFields();
+        List<FldInfo> fldInfos = new ArrayList<>();
+        for (Field field : fields) {
+            // 是否引用ApiModelProperty注解
+            String name = field.getName();
+            String typeName = field.getType().getName();
+
+            boolean bool = field.isAnnotationPresent(Excel.class);
+            String cnName = "";
+            if (bool) {
+                cnName = field.getAnnotation(Excel.class).name();
+//                fldInfos.add(new FldInfo(value);
+                System.out.print(cnName);
+
+            }
+            if (cnName == "" || cnName == null)
+                cnName = name;
+            fldInfos.add(new FldInfo(name, cnName, typeName));
+        }
+        return fldInfos;
     }
 //
 //    private GeometryFactory geometryFactory = new GeometryFactory();

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/C12SfjbMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectC12SfjbVo">
-        select smid, smuserid, smarea, smperimeter, smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c1_2_sfjb"
+        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c1_2_sfjb"
     </sql>
 
     <select id="selectC12SfjbList" parameterType="com.onemap.sanya.domain.spatial.C12Sfjb" resultMap="C12SfjbResult">
@@ -42,7 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectC12SfjbVo"/>
         where smid = #{smid}
     </select>
-        
+
+    <select id="selectByPolygon" parameterType="String" resultMap="C12SfjbResult">
+        <include refid="selectC12SfjbVo"/>
+        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+    </select>
+
     <insert id="insertC12Sfjb" parameterType="com.onemap.sanya.domain.spatial.C12Sfjb" useGeneratedKeys="true" keyProperty="smid">
         insert into "c1_2_sfjb"
         <trim prefix="(" suffix=")" suffixOverrides=",">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/C22ZzjbMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectC22ZzjbVo">
-        select smid, smuserid, smarea, smperimeter, smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c2_2_zzjb"
+        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c2_2_zzjb"
     </sql>
 
     <select id="selectC22ZzjbList" parameterType="com.onemap.sanya.domain.spatial.C22Zzjb" resultMap="C22ZzjbResult">
@@ -42,7 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectC22ZzjbVo"/>
         where smid = #{smid}
     </select>
-        
+
+    <select id="selectByPolygon" parameterType="String" resultMap="C22ZzjbResult">
+        <include refid="selectC22ZzjbVo"/>
+        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+    </select>
+
     <insert id="insertC22Zzjb" parameterType="com.onemap.sanya.domain.spatial.C22Zzjb" useGeneratedKeys="true" keyProperty="smid">
         insert into "c2_2_zzjb"
         <trim prefix="(" suffix=")" suffixOverrides=",">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/C32GyjbMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectC32GyjbVo">
-        select smid, smuserid, smarea, smperimeter, smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c3_2_gyjb"
+        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c3_2_gyjb"
     </sql>
 
     <select id="selectC32GyjbList" parameterType="com.onemap.sanya.domain.spatial.C32Gyjb" resultMap="C32GyjbResult">
@@ -42,7 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectC32GyjbVo"/>
         where smid = #{smid}
     </select>
-        
+
+    <select id="selectByPolygon" parameterType="String" resultMap="C32GyjbResult">
+        <include refid="selectC32GyjbVo"/>
+        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+    </select>
+
     <insert id="insertC32Gyjb" parameterType="com.onemap.sanya.domain.spatial.C32Gyjb" useGeneratedKeys="true" keyProperty="smid">
         insert into "c3_2_gyjb"
         <trim prefix="(" suffix=")" suffixOverrides=",">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/C41GfjbMapper.xml

@@ -15,22 +15,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qpbh"    column="qpbh"    />
         <result property="新闻出版用地"    column="新闻出版用地"    />
         <result property="新闻地价"    column="新闻_地价"    />
-        <result property="医疗卫生、社会福利用地"    column="医疗卫生、社会福利用地"    />
+        <result property="医疗卫生社会福利用地"    column="医疗卫生、社会福利用地"    />
         <result property="医疗地价"    column="医疗_地价"    />
-        <result property="教育、科研用地"    column="教育、科研用地"    />
+        <result property="教育科研用地"    column="教育、科研用地"    />
         <result property="教育地价"    column="教育_地价"    />
         <result property="机关团体用地"    column="机关团体用地"    />
         <result property="机关地价"    column="机关_地价"    />
-        <result property="文化设施、体育用地"    column="文化设施、体育用地"    />
+        <result property="文化设施体育用地"    column="文化设施、体育用地"    />
         <result property="文化地价"    column="文化_地价"    />
-        <result property="公园与绿地、公用设施用地"    column="公园与绿地、公用设施用地"    />
+        <result property="公园与绿地公用设施用地"    column="公园与绿地、公用设施用地"    />
         <result property="公园地价"    column="公园_地价"    />
         <result property="shapeLength"    column="shape_length"    />
         <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectC41GfjbVo">
-        select smid, smuserid, smarea, smperimeter, smgeometry, objectid, 土地级别, qpbh, 新闻出版用地, 新闻_地价, 医疗卫生、社会福利用地, 医疗_地价, 教育、科研用地, 教育_地价, 机关团体用地, 机关_地价, 文化设施、体育用地, 文化_地价, 公园与绿地、公用设施用地, 公园_地价, shape_length, shape_area from "c4_1_gfjb"
+        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, 土地级别, qpbh, 新闻出版用地, 新闻_地价, 医疗卫生、社会福利用地, 医疗_地价, 教育、科研用地, 教育_地价, 机关团体用地, 机关_地价, 文化设施、体育用地, 文化_地价, 公园与绿地、公用设施用地, 公园_地价, shape_length, shape_area from "c4_1_gfjb"
     </sql>
 
     <select id="selectC41GfjbList" parameterType="com.onemap.sanya.domain.spatial.C41Gfjb" resultMap="C41GfjbResult">
@@ -64,7 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectC41GfjbVo"/>
         where smid = #{smid}
     </select>
-        
+
+    <select id="selectByPolygon" parameterType="String" resultMap="C41GfjbResult">
+        <include refid="selectC41GfjbVo"/>
+        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+    </select>
+
     <insert id="insertC41Gfjb" parameterType="com.onemap.sanya.domain.spatial.C41Gfjb" useGeneratedKeys="true" keyProperty="smid">
         insert into "c4_1_gfjb"
         <trim prefix="(" suffix=")" suffixOverrides=",">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/GhdkMapper.xml

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectGhdkVo">
-        select smid, smuserid, smarea, smperimeter, smgeometry, objectid, sjxzqmc, xjxzqmc, xzmc, ghcgmc, bzsj, bzdw, pzwh, pfsj, sjwt, kzxxgyddm, kzxxgydmc, hhydzbsm, dkbm, dkfbm, ydmj, jzmj, rjld, rjlx, rjlsm, jzmdd, jzmdx, jzmdsm, ldld, ldlx, ldlsm, jzxgd, jzxgx, jzxgsm, pjjdcw, pjjdcwsm, pjfjdcw, kzxzbsm, dkbz, jrx, ghsjyq, cssjyd, pjss, jzmjsm, pjfjdcwsm, xzqdm, bz, ydflbz, jzxs, jzxssm, shape_length, shape_area from "ghdk"
+        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, sjxzqmc, xjxzqmc, xzmc, ghcgmc, bzsj, bzdw, pzwh, pfsj, sjwt, kzxxgyddm, kzxxgydmc, hhydzbsm, dkbm, dkfbm, ydmj, jzmj, rjld, rjlx, rjlsm, jzmdd, jzmdx, jzmdsm, ldld, ldlx, ldlsm, jzxgd, jzxgx, jzxgsm, pjjdcw, pjjdcwsm, pjfjdcw, kzxzbsm, dkbz, jrx, ghsjyq, cssjyd, pjss, jzmjsm, pjfjdcwsm, xzqdm, bz, ydflbz, jzxs, jzxssm, shape_length, shape_area from "ghdk"
     </sql>
 
     <select id="selectGhdkList" parameterType="com.onemap.sanya.domain.spatial.Ghdk" resultMap="GhdkResult">