中图代码更新

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/ZtZdCqReultList.java

@@ -59,7 +59,11 @@ public class ZtZdCqReultList extends BaseEntity
     /** 集体建筑面积 */
     @Excel(name = "集体建筑面积")
     private Double jtJZMJ;
+    /**国有补偿8 */
+    private Double gyPay;
+    /** 集体补偿 */
 
+    private Double jtPay;
     /** 国有建筑数量 */
     @Excel(name = "国有建筑数量")
     private Integer gyCount;
@@ -72,9 +76,7 @@ public class ZtZdCqReultList extends BaseEntity
     @Excel(name = "集体列表")
     private String jtList;
       private List<FWItem> jtFWData;
-
-
-    /** 相关图元信息 */
+          /** 相关图元信息 */
     @Excel(name = "相关图元信息")
     private String jtfeatures;
 
@@ -177,6 +179,25 @@ public class ZtZdCqReultList extends BaseEntity
         this.gyCount = gyCount;
     }
 
+
+    public Double getGyPay()
+    {
+        return gyPay;
+    }
+    public void setGyPay(Double gyPay)
+    {
+        this.gyPay = gyPay;
+    }
+
+    public Double getJtPay()
+    {
+        return jtPay;
+    }
+    public void setJtPay(Double jtPay)
+    {
+        this.jtPay = jtPay;
+    }
+
     public Integer getGyCount()
     {
         return gyCount;

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

@@ -1,36 +1,27 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
 import com.onemap.common.core.web.domain.BaseEntity;
+
 /**
  * 建筑矢量对象 bdc
  * 
  * @author ruoyi
- * @date 2024-08-30
+ * @date 2024-11-14
  */
 public class Bdc extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
-    /** $column.columnComment */
-    private Integer smuserid;
-
-    /** $column.columnComment */
-
-    private Double smarea;
+    private Integer gid;
 
-    /** $column.columnComment */
 
-    private Double smperimeter;
 
     /** $column.columnComment */
-
-    private String smgeometry;
+    private Integer id;
 
     /** 建筑高度(米) */
     @Excel(name = "建筑高度(米)")
@@ -40,9 +31,8 @@ public class Bdc extends BaseEntity
     @Excel(name = "层数")
     private Integer floor;
 
-    /** 产权人 */
-    @Excel(name = "房屋结构")
-    private String jg;
+
+
     /** 产权人 */
     @Excel(name = "产权人")
     private String cqr;
@@ -51,6 +41,10 @@ public class Bdc extends BaseEntity
     @Excel(name = "地址")
     private String address;
 
+    /** 房屋结构 */
+    @Excel(name = "房屋结构")
+    private String jg;
+
     /** 等级 */
     @Excel(name = "等级")
     private Integer grade;
@@ -63,50 +57,28 @@ public class Bdc extends BaseEntity
     @Excel(name = "建筑面积(平方米)")
     private Double jzmj;
 
-    public void setSmid(Integer smid) 
-    {
-        this.smid = smid;
-    }
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 
-    public Integer getSmid() 
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid) 
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid() 
-    {
-        return smuserid;
-    }
-    public void setSmarea(Double smarea) 
+    public void setGid(Integer gid) 
     {
-        this.smarea = smarea;
+        this.gid = gid;
     }
 
-    public Double getSmarea() 
-    {
-        return smarea;
-    }
-    public void setSmperimeter(Double smperimeter) 
+    public Integer getGid() 
     {
-        this.smperimeter = smperimeter;
+        return gid;
     }
 
-    public Double getSmperimeter() 
+    public void setId(Integer id) 
     {
-        return smperimeter;
-    }
-    public void setSmgeometry(String smgeometry) 
-    {
-        this.smgeometry = smgeometry;
+        this.id = id;
     }
 
-    public String getSmgeometry() 
+    public Integer getId() 
     {
-        return smgeometry;
+        return id;
     }
     public void setHeight(Double height) 
     {
@@ -126,6 +98,15 @@ public class Bdc extends BaseEntity
     {
         return floor;
     }
+    public void setGeom(String geom) 
+    {
+        this.geom = geom;
+    }
+
+    public String getGeom() 
+    {
+        return geom;
+    }
     public void setCqr(String cqr) 
     {
         this.cqr = cqr;
@@ -144,6 +125,15 @@ public class Bdc extends BaseEntity
     {
         return address;
     }
+    public void setJg(String jg) 
+    {
+        this.jg = jg;
+    }
+
+    public String getJg() 
+    {
+        return jg;
+    }
     public void setGrade(Integer grade) 
     {
         this.grade = grade;
@@ -172,26 +162,17 @@ public class Bdc extends BaseEntity
         return jzmj;
     }
 
-    public String getJg() {
-        return jg;
-    }
-
-    public void setJg(String jg) {
-        this.jg = jg;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("smid", getSmid())
-            .append("smuserid", getSmuserid())
-            .append("smarea", getSmarea())
-            .append("smperimeter", getSmperimeter())
-            .append("smgeometry", getSmgeometry())
+            .append("gid", getGid())
+            .append("id", getId())
             .append("height", getHeight())
             .append("floor", getFloor())
+            .append("geom", getGeom())
             .append("cqr", getCqr())
             .append("address", getAddress())
+            .append("jg", getJg())
             .append("grade", getGrade())
             .append("zdmj", getZdmj())
             .append("jzmj", getJzmj())

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

@@ -13,7 +13,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * c1_2_商服级别对象 c1_2_sfjb
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -22,24 +22,12 @@ public class C12Sfjb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
+    /** $column.columnComment */
+    private Integer id;
 
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
 
-    /** 面积 */
-    @Excel(name = "面积")
-    private Double smarea;
 
-    /** 周长 */
-    @Excel(name = "周长")
-    private Double smperimeter;
 
-    /** 范围坐标 */
-    @Excel(name = "范围坐标")
-    private String smgeometry;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -56,15 +44,10 @@ public class C12Sfjb extends BaseEntity
     private Double 楼面单价;
 
     /** $column.columnComment */
-
+    @Excel(name = "qpbh", readConverterExp = "$column.readConverterExp()")
     private String qpbh;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
-
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -13,7 +13,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * c2_2_住宅级别对象 c2_2_zzjb
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -22,27 +22,11 @@ public class C22Zzjb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
-
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
-
-    /** 面积 */
-    @Excel(name = "面积")
-    private Double smarea;
-
-    /** 周长 */
-    @Excel(name = "周长")
-    private Double smperimeter;
-
-    /** 范围坐标 */
-    @Excel(name = "范围坐标")
-    private String smgeometry;
+    /** $column.columnComment */
+    private Integer id;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "objectid", readConverterExp = "$column.readConverterExp()")
     private Integer objectid;
 
     /** 土地级别 */
@@ -56,15 +40,11 @@ public class C22Zzjb extends BaseEntity
     private Double 楼面单价;
 
     /** $column.columnComment */
-
+    @Excel(name = "qpbh", readConverterExp = "$column.readConverterExp()")
     private String qpbh;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 
 }

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

@@ -13,7 +13,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * c3_2_工业级别对象 c3_2_gyjb
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -22,32 +22,16 @@ public class C32Gyjb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
-
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
-
-    /** 面积 */
-    @Excel(name = "面积")
-    private Double smarea;
-
-    /** 周长 */
-    @Excel(name = "周长")
-    private Double smperimeter;
-
-    /** 范围坐标 */
-    @Excel(name = "范围坐标")
-    private String smgeometry;
+    /** $column.columnComment */
+    private Integer id;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "objectid", readConverterExp = "$column.readConverterExp()")
     private Integer objectid;
 
     /** 土地级别 */
     @Excel(name = "土地级别")
-    @JsonProperty("土地级别")
+    @JsonProperty("楼面单价")
     private String 土地级别;
 
     /** 楼面单价 */
@@ -56,15 +40,10 @@ public class C32Gyjb extends BaseEntity
     private Double 楼面单价;
 
     /** $column.columnComment */
-
+    @Excel(name = "qpbh", readConverterExp = "$column.readConverterExp()")
     private String qpbh;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
-
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -13,7 +13,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * c4_1_公服级别对象 c4_1_gfjb
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -22,27 +22,14 @@ public class C41Gfjb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
-
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
+    /** $column.columnComment */
+    private Integer id;
 
-    /** 面积 */
-    @Excel(name = "面积")
-    private Double smarea;
 
-    /** 周长 */
-    @Excel(name = "周长")
-    private Double smperimeter;
 
-    /** 范围坐标 */
-    @Excel(name = "范围坐标")
-    private String smgeometry;
 
-    /** objectid */
-    @Excel(name = "objectid")
+    /** $column.columnComment */
+    @Excel(name = "objectid", readConverterExp = "$column.readConverterExp()")
     private Integer objectid;
 
     /** 土地级别 */
@@ -50,8 +37,8 @@ public class C41Gfjb extends BaseEntity
     @JsonProperty("土地级别")
     private String 土地级别;
 
-    /** qpbh */
-    @Excel(name = "qpbh")
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String qpbh;
 
     /** 新闻出版用地 */
@@ -114,12 +101,7 @@ public class C41Gfjb extends BaseEntity
     @JsonProperty("公园_地价")
     private Double 公园地价;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
-
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -1,6 +1,8 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -10,37 +12,27 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 地类图斑对象 dltb
  * 
  * @author ruoyi
- * @date 2024-08-27
+ * @date 2024-11-14
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Dltb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
+    private Integer id0;
 
-    /** $column.columnComment */
-
-    private Integer smuserid;
-
-    /** $column.columnComment */
-
-    private Double smarea;
 
-    /** $column.columnComment */
 
-    private Double smperimeter;
 
     /** $column.columnComment */
-
-    private String smgeometry;
-
-    /** $column.columnComment */
-
+    @Excel(name = "objectid", readConverterExp = "$column.readConverterExp()")
     private Integer objectid;
 
     /** $column.columnComment */
-
+    @Excel(name = "fidDltb2", readConverterExp = "$column.readConverterExp()")
     private Integer fidDltb2;
 
     /** 标识码 */
@@ -152,474 +144,33 @@ public class Dltb extends BaseEntity
     private Integer sjnf;
 
     /** $column.columnComment */
-
+    @Excel(name = "mssm", readConverterExp = "$column.readConverterExp()")
     private String mssm;
 
     /** $column.columnComment */
-
+    @Excel(name = "hdmc", readConverterExp = "$column.readConverterExp()")
     private String hdmc;
 
     /** $column.columnComment */
-
+    @Excel(name = "bz", readConverterExp = "$column.readConverterExp()")
     private String bz;
 
     /** $column.columnComment */
-
+    @Excel(name = "shapeLeng", readConverterExp = "$column.readConverterExp()")
     private Double shapeLeng;
 
     /** $column.columnComment */
-
+    @Excel(name = "fidNewSh", readConverterExp = "$column.readConverterExp()")
     private Integer fidNewSh;
 
     /** $column.columnComment */
     private Integer id;
 
     /** $column.columnComment */
-
+    @Excel(name = "ss", readConverterExp = "$column.readConverterExp()")
     private Double ss;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
-
-    public void setSmid(Integer smid)
-    {
-        this.smid = smid;
-    }
-
-    public Integer getSmid()
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid)
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid()
-    {
-        return smuserid;
-    }
-    public void setSmarea(Double smarea)
-    {
-        this.smarea = smarea;
-    }
-
-    public Double getSmarea()
-    {
-        return smarea;
-    }
-    public void setSmperimeter(Double smperimeter)
-    {
-        this.smperimeter = smperimeter;
-    }
-
-    public Double getSmperimeter()
-    {
-        return smperimeter;
-    }
-    public void setSmgeometry(String smgeometry)
-    {
-        this.smgeometry = smgeometry;
-    }
-
-    public String getSmgeometry()
-    {
-        return smgeometry;
-    }
-    public void setObjectid(Integer objectid)
-    {
-        this.objectid = objectid;
-    }
-
-    public Integer getObjectid()
-    {
-        return objectid;
-    }
-    public void setFidDltb2(Integer fidDltb2)
-    {
-        this.fidDltb2 = fidDltb2;
-    }
-
-    public Integer getFidDltb2()
-    {
-        return fidDltb2;
-    }
-    public void setBsm(String bsm)
-    {
-        this.bsm = bsm;
-    }
-
-    public String getBsm()
-    {
-        return bsm;
-    }
-    public void setYsdm(String ysdm)
-    {
-        this.ysdm = ysdm;
-    }
-
-    public String getYsdm()
-    {
-        return ysdm;
-    }
-    public void setTbybh(String tbybh)
-    {
-        this.tbybh = tbybh;
-    }
-
-    public String getTbybh()
-    {
-        return tbybh;
-    }
-    public void setTbbh(String tbbh)
-    {
-        this.tbbh = tbbh;
-    }
-
-    public String getTbbh()
-    {
-        return tbbh;
-    }
-    public void setDlbm(String dlbm)
-    {
-        this.dlbm = dlbm;
-    }
-
-    public String getDlbm()
-    {
-        return dlbm;
-    }
-    public void setDlmc(String dlmc)
-    {
-        this.dlmc = dlmc;
-    }
-
-    public String getDlmc()
-    {
-        return dlmc;
-    }
-    public void setQsxz(String qsxz)
-    {
-        this.qsxz = qsxz;
-    }
-
-    public String getQsxz()
-    {
-        return qsxz;
-    }
-    public void setQsdwdm(String qsdwdm)
-    {
-        this.qsdwdm = qsdwdm;
-    }
-
-    public String getQsdwdm()
-    {
-        return qsdwdm;
-    }
-    public void setQsdwmc(String qsdwmc)
-    {
-        this.qsdwmc = qsdwmc;
-    }
-
-    public String getQsdwmc()
-    {
-        return qsdwmc;
-    }
-    public void setZldwdm(String zldwdm)
-    {
-        this.zldwdm = zldwdm;
-    }
-
-    public String getZldwdm()
-    {
-        return zldwdm;
-    }
-    public void setZldwmc(String zldwmc)
-    {
-        this.zldwmc = zldwmc;
-    }
-
-    public String getZldwmc()
-    {
-        return zldwmc;
-    }
-    public void setTbmj(Double tbmj)
-    {
-        this.tbmj = tbmj;
-    }
-
-    public Double getTbmj()
-    {
-        return tbmj;
-    }
-    public void setKcdlbm(String kcdlbm)
-    {
-        this.kcdlbm = kcdlbm;
-    }
-
-    public String getKcdlbm()
-    {
-        return kcdlbm;
-    }
-    public void setKcxs(Double kcxs)
-    {
-        this.kcxs = kcxs;
-    }
-
-    public Double getKcxs()
-    {
-        return kcxs;
-    }
-    public void setKcmj(Double kcmj)
-    {
-        this.kcmj = kcmj;
-    }
-
-    public Double getKcmj()
-    {
-        return kcmj;
-    }
-    public void setTbdlmj(Double tbdlmj)
-    {
-        this.tbdlmj = tbdlmj;
-    }
-
-    public Double getTbdlmj()
-    {
-        return tbdlmj;
-    }
-    public void setGdlx(String gdlx)
-    {
-        this.gdlx = gdlx;
-    }
-
-    public String getGdlx()
-    {
-        return gdlx;
-    }
-    public void setGdpdjb(String gdpdjb)
-    {
-        this.gdpdjb = gdpdjb;
-    }
-
-    public String getGdpdjb()
-    {
-        return gdpdjb;
-    }
-    public void setXzdwkd(Double xzdwkd)
-    {
-        this.xzdwkd = xzdwkd;
-    }
-
-    public Double getXzdwkd()
-    {
-        return xzdwkd;
-    }
-    public void setTbxhdm(String tbxhdm)
-    {
-        this.tbxhdm = tbxhdm;
-    }
-
-    public String getTbxhdm()
-    {
-        return tbxhdm;
-    }
-    public void setTbxhmc(String tbxhmc)
-    {
-        this.tbxhmc = tbxhmc;
-    }
-
-    public String getTbxhmc()
-    {
-        return tbxhmc;
-    }
-    public void setZzsxdm(String zzsxdm)
-    {
-        this.zzsxdm = zzsxdm;
-    }
-
-    public String getZzsxdm()
-    {
-        return zzsxdm;
-    }
-    public void setZzsxmc(String zzsxmc)
-    {
-        this.zzsxmc = zzsxmc;
-    }
-
-    public String getZzsxmc()
-    {
-        return zzsxmc;
-    }
-    public void setGddb(Integer gddb)
-    {
-        this.gddb = gddb;
-    }
-
-    public Integer getGddb()
-    {
-        return gddb;
-    }
-    public void setFrdbs(String frdbs)
-    {
-        this.frdbs = frdbs;
-    }
-
-    public String getFrdbs()
-    {
-        return frdbs;
-    }
-    public void setCzcsxm(String czcsxm)
-    {
-        this.czcsxm = czcsxm;
-    }
-
-    public String getCzcsxm()
-    {
-        return czcsxm;
-    }
-    public void setSjnf(Integer sjnf)
-    {
-        this.sjnf = sjnf;
-    }
-
-    public Integer getSjnf()
-    {
-        return sjnf;
-    }
-    public void setMssm(String mssm)
-    {
-        this.mssm = mssm;
-    }
-
-    public String getMssm()
-    {
-        return mssm;
-    }
-    public void setHdmc(String hdmc)
-    {
-        this.hdmc = hdmc;
-    }
-
-    public String getHdmc()
-    {
-        return hdmc;
-    }
-    public void setBz(String bz)
-    {
-        this.bz = bz;
-    }
-
-    public String getBz()
-    {
-        return bz;
-    }
-    public void setShapeLeng(Double shapeLeng)
-    {
-        this.shapeLeng = shapeLeng;
-    }
-
-    public Double getShapeLeng()
-    {
-        return shapeLeng;
-    }
-    public void setFidNewSh(Integer fidNewSh)
-    {
-        this.fidNewSh = fidNewSh;
-    }
-
-    public Integer getFidNewSh()
-    {
-        return fidNewSh;
-    }
-    public void setId(Integer id)
-    {
-        this.id = id;
-    }
-
-    public Integer getId()
-    {
-        return id;
-    }
-    public void setSs(Double ss)
-    {
-        this.ss = ss;
-    }
-
-    public Double getSs()
-    {
-        return ss;
-    }
-    public void setShapeLength(Double shapeLength)
-    {
-        this.shapeLength = shapeLength;
-    }
-
-    public Double getShapeLength()
-    {
-        return shapeLength;
-    }
-    public void setShapeArea(Double shapeArea)
-    {
-        this.shapeArea = shapeArea;
-    }
-
-    public Double getShapeArea()
-    {
-        return shapeArea;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("smid", getSmid())
-                .append("smuserid", getSmuserid())
-                .append("smarea", getSmarea())
-                .append("smperimeter", getSmperimeter())
-                .append("smgeometry", getSmgeometry())
-                .append("objectid", getObjectid())
-                .append("fidDltb2", getFidDltb2())
-                .append("bsm", getBsm())
-                .append("ysdm", getYsdm())
-                .append("tbybh", getTbybh())
-                .append("tbbh", getTbbh())
-                .append("dlbm", getDlbm())
-                .append("dlmc", getDlmc())
-                .append("qsxz", getQsxz())
-                .append("qsdwdm", getQsdwdm())
-                .append("qsdwmc", getQsdwmc())
-                .append("zldwdm", getZldwdm())
-                .append("zldwmc", getZldwmc())
-                .append("tbmj", getTbmj())
-                .append("kcdlbm", getKcdlbm())
-                .append("kcxs", getKcxs())
-                .append("kcmj", getKcmj())
-                .append("tbdlmj", getTbdlmj())
-                .append("gdlx", getGdlx())
-                .append("gdpdjb", getGdpdjb())
-                .append("xzdwkd", getXzdwkd())
-                .append("tbxhdm", getTbxhdm())
-                .append("tbxhmc", getTbxhmc())
-                .append("zzsxdm", getZzsxdm())
-                .append("zzsxmc", getZzsxmc())
-                .append("gddb", getGddb())
-                .append("frdbs", getFrdbs())
-                .append("czcsxm", getCzcsxm())
-                .append("sjnf", getSjnf())
-                .append("mssm", getMssm())
-                .append("hdmc", getHdmc())
-                .append("bz", getBz())
-                .append("shapeLeng", getShapeLeng())
-                .append("fidNewSh", getFidNewSh())
-                .append("id", getId())
-                .append("ss", getSs())
-                .append("shapeLength", getShapeLength())
-                .append("shapeArea", getShapeArea())
-                .toString();
-    }
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -12,7 +12,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 规划地块对象 ghdk
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -21,24 +21,11 @@ public class Ghdk extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
+    /** $column.columnComment */
+    private Integer id;
 
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
 
-    /** smarea */
-    @Excel(name = "smarea")
-    private Double smarea;
 
-    /** smperimeter */
-    @Excel(name = "smperimeter")
-    private Double smperimeter;
-
-    /** smgeometry */
-    @Excel(name = "smgeometry")
-    private String smgeometry;
 
     /** objectid */
     @Excel(name = "objectid")
@@ -220,12 +207,7 @@ public class Ghdk extends BaseEntity
     @Excel(name = "建筑系数说明")
     private String jzxssm;
 
-    /** Shape_Length */
-    @Excel(name = "Shape_Length")
-    private Double shapeLength;
-
-    /** Shape_Area */
-    @Excel(name = "Shape_Area")
-    private Double shapeArea;
-
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -1,6 +1,8 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -10,967 +12,202 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 集体所有权对象 jtowner
  * 
  * @author ruoyi
- * @date 2024-08-30
+ * @date 2024-11-14
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Jtowner extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
+    private Integer id;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Integer smuserid;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double smarea;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double smperimeter;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String smgeometry;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer objectid1;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer objectid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer bsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String ysdm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdh;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdsz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String txdz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String tdzl;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String qsxz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String syqlx;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double scmj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double fzmj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double jzrjl;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double jzmd;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String tdjb;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double sbdj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double qdjg;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer zdlsh;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String szxzcmc;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String ms;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String jcr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String jcrq;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String jcsftg;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String jcbtgyy;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blrq;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blsjjcr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blsjjcrq;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blsjjcsftg;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fzr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fzrq;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String sfhg;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String djh;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer sjly;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String tdyt;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer exportflag;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer atqy;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String iid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdtybm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String mapguid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String bz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String qlr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String certNo;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer qlrbs;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fLb;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fXb;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fXdm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fFbf;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCbqssj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCbjssj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fLqsqm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fZysz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fZs;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fSllb;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fZlnd;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fSyqx;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fQlbz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCreateB;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCreateT;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String yzbx;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Integer sjglbsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeLength;
+    private Integer sjglbsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeArea;
-
-    public void setSmid(Integer smid) 
-    {
-        this.smid = smid;
-    }
-
-    public Integer getSmid() 
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid) 
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid() 
-    {
-        return smuserid;
-    }
-    public void setSmarea(Double smarea) 
-    {
-        this.smarea = smarea;
-    }
-
-    public Double getSmarea() 
-    {
-        return smarea;
-    }
-    public void setSmperimeter(Double smperimeter) 
-    {
-        this.smperimeter = smperimeter;
-    }
-
-    public Double getSmperimeter() 
-    {
-        return smperimeter;
-    }
-    public void setSmgeometry(String smgeometry) 
-    {
-        this.smgeometry = smgeometry;
-    }
-
-    public String getSmgeometry() 
-    {
-        return smgeometry;
-    }
-    public void setObjectid1(Integer objectid1) 
-    {
-        this.objectid1 = objectid1;
-    }
-
-    public Integer getObjectid1() 
-    {
-        return objectid1;
-    }
-    public void setObjectid(Integer objectid) 
-    {
-        this.objectid = objectid;
-    }
-
-    public Integer getObjectid() 
-    {
-        return objectid;
-    }
-    public void setBsm(Integer bsm) 
-    {
-        this.bsm = bsm;
-    }
-
-    public Integer getBsm() 
-    {
-        return bsm;
-    }
-    public void setYsdm(String ysdm) 
-    {
-        this.ysdm = ysdm;
-    }
-
-    public String getYsdm() 
-    {
-        return ysdm;
-    }
-    public void setZdh(String zdh) 
-    {
-        this.zdh = zdh;
-    }
-
-    public String getZdh() 
-    {
-        return zdh;
-    }
-    public void setZdsz(String zdsz) 
-    {
-        this.zdsz = zdsz;
-    }
-
-    public String getZdsz() 
-    {
-        return zdsz;
-    }
-    public void setTxdz(String txdz) 
-    {
-        this.txdz = txdz;
-    }
-
-    public String getTxdz() 
-    {
-        return txdz;
-    }
-    public void setTdzl(String tdzl) 
-    {
-        this.tdzl = tdzl;
-    }
-
-    public String getTdzl() 
-    {
-        return tdzl;
-    }
-    public void setQsxz(String qsxz) 
-    {
-        this.qsxz = qsxz;
-    }
-
-    public String getQsxz() 
-    {
-        return qsxz;
-    }
-    public void setSyqlx(String syqlx) 
-    {
-        this.syqlx = syqlx;
-    }
-
-    public String getSyqlx() 
-    {
-        return syqlx;
-    }
-    public void setScmj(Double scmj) 
-    {
-        this.scmj = scmj;
-    }
-
-    public Double getScmj() 
-    {
-        return scmj;
-    }
-    public void setFzmj(Double fzmj) 
-    {
-        this.fzmj = fzmj;
-    }
-
-    public Double getFzmj() 
-    {
-        return fzmj;
-    }
-    public void setJzrjl(Double jzrjl) 
-    {
-        this.jzrjl = jzrjl;
-    }
-
-    public Double getJzrjl() 
-    {
-        return jzrjl;
-    }
-    public void setJzmd(Double jzmd) 
-    {
-        this.jzmd = jzmd;
-    }
-
-    public Double getJzmd() 
-    {
-        return jzmd;
-    }
-    public void setTdjb(String tdjb) 
-    {
-        this.tdjb = tdjb;
-    }
-
-    public String getTdjb() 
-    {
-        return tdjb;
-    }
-    public void setSbdj(Double sbdj) 
-    {
-        this.sbdj = sbdj;
-    }
-
-    public Double getSbdj() 
-    {
-        return sbdj;
-    }
-    public void setQdjg(Double qdjg) 
-    {
-        this.qdjg = qdjg;
-    }
-
-    public Double getQdjg() 
-    {
-        return qdjg;
-    }
-    public void setZdlsh(Integer zdlsh) 
-    {
-        this.zdlsh = zdlsh;
-    }
-
-    public Integer getZdlsh() 
-    {
-        return zdlsh;
-    }
-    public void setSzxzcmc(String szxzcmc) 
-    {
-        this.szxzcmc = szxzcmc;
-    }
-
-    public String getSzxzcmc() 
-    {
-        return szxzcmc;
-    }
-    public void setMs(String ms) 
-    {
-        this.ms = ms;
-    }
-
-    public String getMs() 
-    {
-        return ms;
-    }
-    public void setJcr(String jcr) 
-    {
-        this.jcr = jcr;
-    }
-
-    public String getJcr() 
-    {
-        return jcr;
-    }
-    public void setJcrq(String jcrq) 
-    {
-        this.jcrq = jcrq;
-    }
-
-    public String getJcrq() 
-    {
-        return jcrq;
-    }
-    public void setJcsftg(String jcsftg) 
-    {
-        this.jcsftg = jcsftg;
-    }
-
-    public String getJcsftg() 
-    {
-        return jcsftg;
-    }
-    public void setJcbtgyy(String jcbtgyy) 
-    {
-        this.jcbtgyy = jcbtgyy;
-    }
-
-    public String getJcbtgyy() 
-    {
-        return jcbtgyy;
-    }
-    public void setBlr(String blr) 
-    {
-        this.blr = blr;
-    }
-
-    public String getBlr() 
-    {
-        return blr;
-    }
-    public void setBlrq(String blrq) 
-    {
-        this.blrq = blrq;
-    }
-
-    public String getBlrq() 
-    {
-        return blrq;
-    }
-    public void setBlsjjcr(String blsjjcr) 
-    {
-        this.blsjjcr = blsjjcr;
-    }
-
-    public String getBlsjjcr() 
-    {
-        return blsjjcr;
-    }
-    public void setBlsjjcrq(String blsjjcrq) 
-    {
-        this.blsjjcrq = blsjjcrq;
-    }
-
-    public String getBlsjjcrq() 
-    {
-        return blsjjcrq;
-    }
-    public void setBlsjjcsftg(String blsjjcsftg) 
-    {
-        this.blsjjcsftg = blsjjcsftg;
-    }
-
-    public String getBlsjjcsftg() 
-    {
-        return blsjjcsftg;
-    }
-    public void setFzr(String fzr) 
-    {
-        this.fzr = fzr;
-    }
-
-    public String getFzr() 
-    {
-        return fzr;
-    }
-    public void setFzrq(String fzrq) 
-    {
-        this.fzrq = fzrq;
-    }
-
-    public String getFzrq() 
-    {
-        return fzrq;
-    }
-    public void setSfhg(String sfhg) 
-    {
-        this.sfhg = sfhg;
-    }
-
-    public String getSfhg() 
-    {
-        return sfhg;
-    }
-    public void setDjh(String djh) 
-    {
-        this.djh = djh;
-    }
-
-    public String getDjh() 
-    {
-        return djh;
-    }
-    public void setSjly(Integer sjly) 
-    {
-        this.sjly = sjly;
-    }
-
-    public Integer getSjly() 
-    {
-        return sjly;
-    }
-    public void setTdyt(String tdyt) 
-    {
-        this.tdyt = tdyt;
-    }
-
-    public String getTdyt() 
-    {
-        return tdyt;
-    }
-    public void setExportflag(Integer exportflag) 
-    {
-        this.exportflag = exportflag;
-    }
-
-    public Integer getExportflag() 
-    {
-        return exportflag;
-    }
-    public void setAtqy(Integer atqy) 
-    {
-        this.atqy = atqy;
-    }
-
-    public Integer getAtqy() 
-    {
-        return atqy;
-    }
-    public void setIid(String iid) 
-    {
-        this.iid = iid;
-    }
-
-    public String getIid() 
-    {
-        return iid;
-    }
-    public void setZdtybm(String zdtybm) 
-    {
-        this.zdtybm = zdtybm;
-    }
-
-    public String getZdtybm() 
-    {
-        return zdtybm;
-    }
-    public void setMapguid(String mapguid) 
-    {
-        this.mapguid = mapguid;
-    }
-
-    public String getMapguid() 
-    {
-        return mapguid;
-    }
-    public void setBz(String bz) 
-    {
-        this.bz = bz;
-    }
-
-    public String getBz() 
-    {
-        return bz;
-    }
-    public void setQlr(String qlr) 
-    {
-        this.qlr = qlr;
-    }
-
-    public String getQlr() 
-    {
-        return qlr;
-    }
-    public void setCertNo(String certNo) 
-    {
-        this.certNo = certNo;
-    }
-
-    public String getCertNo() 
-    {
-        return certNo;
-    }
-    public void setQlrbs(Integer qlrbs) 
-    {
-        this.qlrbs = qlrbs;
-    }
-
-    public Integer getQlrbs() 
-    {
-        return qlrbs;
-    }
-    public void setfLb(String fLb) 
-    {
-        this.fLb = fLb;
-    }
-
-    public String getfLb() 
-    {
-        return fLb;
-    }
-    public void setfXb(String fXb) 
-    {
-        this.fXb = fXb;
-    }
-
-    public String getfXb() 
-    {
-        return fXb;
-    }
-    public void setfXdm(String fXdm) 
-    {
-        this.fXdm = fXdm;
-    }
-
-    public String getfXdm() 
-    {
-        return fXdm;
-    }
-    public void setfFbf(String fFbf) 
-    {
-        this.fFbf = fFbf;
-    }
-
-    public String getfFbf() 
-    {
-        return fFbf;
-    }
-    public void setfCbqssj(String fCbqssj) 
-    {
-        this.fCbqssj = fCbqssj;
-    }
-
-    public String getfCbqssj() 
-    {
-        return fCbqssj;
-    }
-    public void setfCbjssj(String fCbjssj) 
-    {
-        this.fCbjssj = fCbjssj;
-    }
-
-    public String getfCbjssj() 
-    {
-        return fCbjssj;
-    }
-    public void setfLqsqm(String fLqsqm) 
-    {
-        this.fLqsqm = fLqsqm;
-    }
-
-    public String getfLqsqm() 
-    {
-        return fLqsqm;
-    }
-    public void setfZysz(String fZysz) 
-    {
-        this.fZysz = fZysz;
-    }
-
-    public String getfZysz() 
-    {
-        return fZysz;
-    }
-    public void setfZs(Integer fZs) 
-    {
-        this.fZs = fZs;
-    }
-
-    public Integer getfZs() 
-    {
-        return fZs;
-    }
-    public void setfSllb(String fSllb) 
-    {
-        this.fSllb = fSllb;
-    }
-
-    public String getfSllb() 
-    {
-        return fSllb;
-    }
-    public void setfZlnd(Integer fZlnd) 
-    {
-        this.fZlnd = fZlnd;
-    }
-
-    public Integer getfZlnd() 
-    {
-        return fZlnd;
-    }
-    public void setfSyqx(String fSyqx) 
-    {
-        this.fSyqx = fSyqx;
-    }
-
-    public String getfSyqx() 
-    {
-        return fSyqx;
-    }
-    public void setfQlbz(String fQlbz) 
-    {
-        this.fQlbz = fQlbz;
-    }
-
-    public String getfQlbz() 
-    {
-        return fQlbz;
-    }
-    public void setfCreateB(String fCreateB) 
-    {
-        this.fCreateB = fCreateB;
-    }
-
-    public String getfCreateB() 
-    {
-        return fCreateB;
-    }
-    public void setfCreateT(String fCreateT) 
-    {
-        this.fCreateT = fCreateT;
-    }
-
-    public String getfCreateT() 
-    {
-        return fCreateT;
-    }
-    public void setYzbx(String yzbx) 
-    {
-        this.yzbx = yzbx;
-    }
-
-    public String getYzbx() 
-    {
-        return yzbx;
-    }
-    public void setSjglbsm(Integer sjglbsm) 
-    {
-        this.sjglbsm = sjglbsm;
-    }
-
-    public Integer getSjglbsm() 
-    {
-        return sjglbsm;
-    }
-    public void setShapeLength(Double shapeLength) 
-    {
-        this.shapeLength = shapeLength;
-    }
-
-    public Double getShapeLength() 
-    {
-        return shapeLength;
-    }
-    public void setShapeArea(Double shapeArea) 
-    {
-        this.shapeArea = shapeArea;
-    }
-
-    public Double getShapeArea() 
-    {
-        return shapeArea;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("smid", getSmid())
-            .append("smuserid", getSmuserid())
-            .append("smarea", getSmarea())
-            .append("smperimeter", getSmperimeter())
-            .append("smgeometry", getSmgeometry())
-            .append("objectid1", getObjectid1())
-            .append("objectid", getObjectid())
-            .append("bsm", getBsm())
-            .append("ysdm", getYsdm())
-            .append("zdh", getZdh())
-            .append("zdsz", getZdsz())
-            .append("txdz", getTxdz())
-            .append("tdzl", getTdzl())
-            .append("qsxz", getQsxz())
-            .append("syqlx", getSyqlx())
-            .append("scmj", getScmj())
-            .append("fzmj", getFzmj())
-            .append("jzrjl", getJzrjl())
-            .append("jzmd", getJzmd())
-            .append("tdjb", getTdjb())
-            .append("sbdj", getSbdj())
-            .append("qdjg", getQdjg())
-            .append("zdlsh", getZdlsh())
-            .append("szxzcmc", getSzxzcmc())
-            .append("ms", getMs())
-            .append("jcr", getJcr())
-            .append("jcrq", getJcrq())
-            .append("jcsftg", getJcsftg())
-            .append("jcbtgyy", getJcbtgyy())
-            .append("blr", getBlr())
-            .append("blrq", getBlrq())
-            .append("blsjjcr", getBlsjjcr())
-            .append("blsjjcrq", getBlsjjcrq())
-            .append("blsjjcsftg", getBlsjjcsftg())
-            .append("fzr", getFzr())
-            .append("fzrq", getFzrq())
-            .append("sfhg", getSfhg())
-            .append("djh", getDjh())
-            .append("sjly", getSjly())
-            .append("tdyt", getTdyt())
-            .append("exportflag", getExportflag())
-            .append("atqy", getAtqy())
-            .append("iid", getIid())
-            .append("zdtybm", getZdtybm())
-            .append("mapguid", getMapguid())
-            .append("bz", getBz())
-            .append("qlr", getQlr())
-            .append("certNo", getCertNo())
-            .append("qlrbs", getQlrbs())
-            .append("fLb", getfLb())
-            .append("fXb", getfXb())
-            .append("fXdm", getfXdm())
-            .append("fFbf", getfFbf())
-            .append("fCbqssj", getfCbqssj())
-            .append("fCbjssj", getfCbjssj())
-            .append("fLqsqm", getfLqsqm())
-            .append("fZysz", getfZysz())
-            .append("fZs", getfZs())
-            .append("fSllb", getfSllb())
-            .append("fZlnd", getfZlnd())
-            .append("fSyqx", getfSyqx())
-            .append("fQlbz", getfQlbz())
-            .append("fCreateB", getfCreateB())
-            .append("fCreateT", getfCreateT())
-            .append("yzbx", getYzbx())
-            .append("sjglbsm", getSjglbsm())
-            .append("shapeLength", getShapeLength())
-            .append("shapeArea", getShapeArea())
-            .toString();
-    }
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -1,6 +1,8 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -10,533 +12,142 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 集体使用权对象 jtuse
  * 
  * @author ruoyi
- * @date 2024-08-30
+ * @date 2024-11-14
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Jtuse extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
+    private Integer id;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Integer smuserid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double smarea;
+    private String geom;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double smperimeter;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String smgeometry;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer objectid1;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer objectid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String syqr;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdtybm;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdzl;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double zdmj;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String tdyt;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String ytdzh;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String mapguid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String iid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String certNo;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer ztid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdh;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fLb;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fXb;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fXdm;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fFbf;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCbqssj;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCbjssj;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fLqsqm;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fZysz;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fZs;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fSllb;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fZlnd;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fSyqx;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fQlbz;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCreateB;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCreateT;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String yzbx;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer sjglbsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeLength;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeArea;
-
-    public void setSmid(Integer smid) 
-    {
-        this.smid = smid;
-    }
-
-    public Integer getSmid() 
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid) 
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid() 
-    {
-        return smuserid;
-    }
-    public void setSmarea(Double smarea) 
-    {
-        this.smarea = smarea;
-    }
-
-    public Double getSmarea() 
-    {
-        return smarea;
-    }
-    public void setSmperimeter(Double smperimeter) 
-    {
-        this.smperimeter = smperimeter;
-    }
-
-    public Double getSmperimeter() 
-    {
-        return smperimeter;
-    }
-    public void setSmgeometry(String smgeometry) 
-    {
-        this.smgeometry = smgeometry;
-    }
-
-    public String getSmgeometry() 
-    {
-        return smgeometry;
-    }
-    public void setObjectid1(Integer objectid1) 
-    {
-        this.objectid1 = objectid1;
-    }
-
-    public Integer getObjectid1() 
-    {
-        return objectid1;
-    }
-    public void setObjectid(Integer objectid) 
-    {
-        this.objectid = objectid;
-    }
-
-    public Integer getObjectid() 
-    {
-        return objectid;
-    }
-    public void setSyqr(String syqr) 
-    {
-        this.syqr = syqr;
-    }
-
-    public String getSyqr() 
-    {
-        return syqr;
-    }
-    public void setZdtybm(String zdtybm) 
-    {
-        this.zdtybm = zdtybm;
-    }
-
-    public String getZdtybm() 
-    {
-        return zdtybm;
-    }
-    public void setZdzl(String zdzl) 
-    {
-        this.zdzl = zdzl;
-    }
-
-    public String getZdzl() 
-    {
-        return zdzl;
-    }
-    public void setZdmj(Double zdmj) 
-    {
-        this.zdmj = zdmj;
-    }
-
-    public Double getZdmj() 
-    {
-        return zdmj;
-    }
-    public void setTdyt(String tdyt) 
-    {
-        this.tdyt = tdyt;
-    }
-
-    public String getTdyt() 
-    {
-        return tdyt;
-    }
-    public void setYtdzh(String ytdzh) 
-    {
-        this.ytdzh = ytdzh;
-    }
-
-    public String getYtdzh() 
-    {
-        return ytdzh;
-    }
-    public void setMapguid(String mapguid) 
-    {
-        this.mapguid = mapguid;
-    }
-
-    public String getMapguid() 
-    {
-        return mapguid;
-    }
-    public void setIid(String iid) 
-    {
-        this.iid = iid;
-    }
-
-    public String getIid() 
-    {
-        return iid;
-    }
-    public void setCertNo(String certNo) 
-    {
-        this.certNo = certNo;
-    }
-
-    public String getCertNo() 
-    {
-        return certNo;
-    }
-    public void setZtid(Integer ztid) 
-    {
-        this.ztid = ztid;
-    }
-
-    public Integer getZtid() 
-    {
-        return ztid;
-    }
-    public void setZdh(String zdh) 
-    {
-        this.zdh = zdh;
-    }
-
-    public String getZdh() 
-    {
-        return zdh;
-    }
-    public void setfLb(String fLb) 
-    {
-        this.fLb = fLb;
-    }
-
-    public String getfLb() 
-    {
-        return fLb;
-    }
-    public void setfXb(String fXb) 
-    {
-        this.fXb = fXb;
-    }
-
-    public String getfXb() 
-    {
-        return fXb;
-    }
-    public void setfXdm(String fXdm) 
-    {
-        this.fXdm = fXdm;
-    }
-
-    public String getfXdm() 
-    {
-        return fXdm;
-    }
-    public void setfFbf(String fFbf) 
-    {
-        this.fFbf = fFbf;
-    }
-
-    public String getfFbf() 
-    {
-        return fFbf;
-    }
-    public void setfCbqssj(String fCbqssj) 
-    {
-        this.fCbqssj = fCbqssj;
-    }
-
-    public String getfCbqssj() 
-    {
-        return fCbqssj;
-    }
-    public void setfCbjssj(String fCbjssj) 
-    {
-        this.fCbjssj = fCbjssj;
-    }
-
-    public String getfCbjssj() 
-    {
-        return fCbjssj;
-    }
-    public void setfLqsqm(String fLqsqm) 
-    {
-        this.fLqsqm = fLqsqm;
-    }
-
-    public String getfLqsqm() 
-    {
-        return fLqsqm;
-    }
-    public void setfZysz(String fZysz) 
-    {
-        this.fZysz = fZysz;
-    }
-
-    public String getfZysz() 
-    {
-        return fZysz;
-    }
-    public void setfZs(Integer fZs) 
-    {
-        this.fZs = fZs;
-    }
-
-    public Integer getfZs() 
-    {
-        return fZs;
-    }
-    public void setfSllb(String fSllb) 
-    {
-        this.fSllb = fSllb;
-    }
-
-    public String getfSllb() 
-    {
-        return fSllb;
-    }
-    public void setfZlnd(Integer fZlnd) 
-    {
-        this.fZlnd = fZlnd;
-    }
-
-    public Integer getfZlnd() 
-    {
-        return fZlnd;
-    }
-    public void setfSyqx(String fSyqx) 
-    {
-        this.fSyqx = fSyqx;
-    }
-
-    public String getfSyqx() 
-    {
-        return fSyqx;
-    }
-    public void setfQlbz(String fQlbz) 
-    {
-        this.fQlbz = fQlbz;
-    }
-
-    public String getfQlbz() 
-    {
-        return fQlbz;
-    }
-    public void setfCreateB(String fCreateB) 
-    {
-        this.fCreateB = fCreateB;
-    }
-
-    public String getfCreateB() 
-    {
-        return fCreateB;
-    }
-    public void setfCreateT(String fCreateT) 
-    {
-        this.fCreateT = fCreateT;
-    }
-
-    public String getfCreateT() 
-    {
-        return fCreateT;
-    }
-    public void setYzbx(String yzbx) 
-    {
-        this.yzbx = yzbx;
-    }
-
-    public String getYzbx() 
-    {
-        return yzbx;
-    }
-    public void setSjglbsm(Integer sjglbsm) 
-    {
-        this.sjglbsm = sjglbsm;
-    }
-
-    public Integer getSjglbsm() 
-    {
-        return sjglbsm;
-    }
-    public void setShapeLength(Double shapeLength) 
-    {
-        this.shapeLength = shapeLength;
-    }
-
-    public Double getShapeLength() 
-    {
-        return shapeLength;
-    }
-    public void setShapeArea(Double shapeArea) 
-    {
-        this.shapeArea = shapeArea;
-    }
-
-    public Double getShapeArea() 
-    {
-        return shapeArea;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("smid", getSmid())
-            .append("smuserid", getSmuserid())
-            .append("smarea", getSmarea())
-            .append("smperimeter", getSmperimeter())
-            .append("smgeometry", getSmgeometry())
-            .append("objectid1", getObjectid1())
-            .append("objectid", getObjectid())
-            .append("syqr", getSyqr())
-            .append("zdtybm", getZdtybm())
-            .append("zdzl", getZdzl())
-            .append("zdmj", getZdmj())
-            .append("tdyt", getTdyt())
-            .append("ytdzh", getYtdzh())
-            .append("mapguid", getMapguid())
-            .append("iid", getIid())
-            .append("certNo", getCertNo())
-            .append("ztid", getZtid())
-            .append("zdh", getZdh())
-            .append("fLb", getfLb())
-            .append("fXb", getfXb())
-            .append("fXdm", getfXdm())
-            .append("fFbf", getfFbf())
-            .append("fCbqssj", getfCbqssj())
-            .append("fCbjssj", getfCbjssj())
-            .append("fLqsqm", getfLqsqm())
-            .append("fZysz", getfZysz())
-            .append("fZs", getfZs())
-            .append("fSllb", getfSllb())
-            .append("fZlnd", getfZlnd())
-            .append("fSyqx", getfSyqx())
-            .append("fQlbz", getfQlbz())
-            .append("fCreateB", getfCreateB())
-            .append("fCreateT", getfCreateT())
-            .append("yzbx", getYzbx())
-            .append("sjglbsm", getSjglbsm())
-            .append("shapeLength", getShapeLength())
-            .append("shapeArea", getShapeArea())
-            .toString();
-    }
 }