修改面积类型

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/qytdzz/AfterTdzz.java

@@ -42,7 +42,7 @@ public class AfterTdzz extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long gm;
+    private Double gm;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -152,12 +152,12 @@ public class AfterTdzz extends BaseEntity
     {
         return wz;
     }
-    public void setGm(Long gm) 
+    public void setGm(Double gm)
     {
         this.gm = gm;
     }
 
-    public Long getGm() 
+    public Double getGm()
     {
         return gm;
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/qytdzz/TQytdzzXzgd.java

@@ -9,379 +9,411 @@ import java.util.List;
 
 /**
  * 新增耕地对象 t_qytdzz_xzgd
- * 
+ *
  * @author ruoyi
  * @date 2024-11-19
  */
-public class TQytdzzXzgd extends BaseEntity
-{
+public class TQytdzzXzgd extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
     private List<Long> ids;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String geom;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String tbbh;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String qsxz;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long tbmj;
+    private Double tbmj;
 
-    /** $column.columnComment */
+    private Double tbmj_m;
+
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String kcdlbm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long kcxs;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long kcmj;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long tbdlmj;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String gdlx;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String gdpdjb;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String frdbs;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String czcsxm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long sjnf;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String bz;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String bsm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String ysdm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String zzhdlmc;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String qsdwdm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String qsdwmc;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String zldwdm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String zldwmc;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String xzgdlydlbm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String zzhdlbm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String xzgdlydlmc;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long xzgdmj;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String xzgddb;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String xzgdlyxm;
 
     private Long zzxmid;
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setGeom(String geom) 
-    {
+
+    public void setGeom(String geom) {
         this.geom = geom;
     }
 
-    public String getGeom() 
-    {
+    public String getGeom() {
         return geom;
     }
-    public void setTbbh(String tbbh) 
-    {
+
+    public void setTbbh(String tbbh) {
         this.tbbh = tbbh;
     }
 
-    public String getTbbh() 
-    {
+    public String getTbbh() {
         return tbbh;
     }
-    public void setQsxz(String qsxz) 
-    {
+
+    public void setQsxz(String qsxz) {
         this.qsxz = qsxz;
     }
 
-    public String getQsxz() 
-    {
+    public String getQsxz() {
         return qsxz;
     }
-    public void setTbmj(Long tbmj) 
-    {
-        this.tbmj = tbmj;
+
+    public Double getTbmj_m() {
+        return tbmj_m;
+    }
+
+    public void setTbmj_m(Double tbmj_m) {
+        this.tbmj_m = tbmj_m;
     }
 
-    public Long getTbmj() 
-    {
+    public Double getTbmj() {
         return tbmj;
     }
-    public void setKcdlbm(String kcdlbm) 
-    {
-        this.kcdlbm = kcdlbm;
+
+    public void setTbmj(Double tbmj) {
+        this.tbmj = tbmj;
     }
 
-    public String getKcdlbm() 
-    {
+    public String getKcdlbm() {
         return kcdlbm;
     }
-    public void setKcxs(Long kcxs) 
-    {
+
+    public void setKcxs(Long kcxs) {
         this.kcxs = kcxs;
     }
 
-    public Long getKcxs() 
-    {
+    public Long getKcxs() {
         return kcxs;
     }
-    public void setKcmj(Long kcmj) 
-    {
+
+    public void setKcmj(Long kcmj) {
         this.kcmj = kcmj;
     }
 
-    public Long getKcmj() 
-    {
+    public Long getKcmj() {
         return kcmj;
     }
-    public void setTbdlmj(Long tbdlmj) 
-    {
+
+    public void setTbdlmj(Long tbdlmj) {
         this.tbdlmj = tbdlmj;
     }
 
-    public Long getTbdlmj() 
-    {
+    public Long getTbdlmj() {
         return tbdlmj;
     }
-    public void setGdlx(String gdlx) 
-    {
+
+    public void setGdlx(String gdlx) {
         this.gdlx = gdlx;
     }
 
-    public String getGdlx() 
-    {
+    public String getGdlx() {
         return gdlx;
     }
-    public void setGdpdjb(String gdpdjb) 
-    {
+
+    public void setGdpdjb(String gdpdjb) {
         this.gdpdjb = gdpdjb;
     }
 
-    public String getGdpdjb() 
-    {
+    public String getGdpdjb() {
         return gdpdjb;
     }
-    public void setFrdbs(String frdbs) 
-    {
+
+    public void setFrdbs(String frdbs) {
         this.frdbs = frdbs;
     }
 
-    public String getFrdbs() 
-    {
+    public String getFrdbs() {
         return frdbs;
     }
-    public void setCzcsxm(String czcsxm) 
-    {
+
+    public void setCzcsxm(String czcsxm) {
         this.czcsxm = czcsxm;
     }
 
-    public String getCzcsxm() 
-    {
+    public String getCzcsxm() {
         return czcsxm;
     }
-    public void setSjnf(Long sjnf) 
-    {
+
+    public void setSjnf(Long sjnf) {
         this.sjnf = sjnf;
     }
 
-    public Long getSjnf() 
-    {
+    public Long getSjnf() {
         return sjnf;
     }
-    public void setBz(String bz) 
-    {
+
+    public void setBz(String bz) {
         this.bz = bz;
     }
 
-    public String getBz() 
-    {
+    public String getBz() {
         return bz;
     }
-    public void setBsm(String bsm) 
-    {
+
+    public void setBsm(String bsm) {
         this.bsm = bsm;
     }
 
-    public String getBsm() 
-    {
+    public String getBsm() {
         return bsm;
     }
-    public void setYsdm(String ysdm) 
-    {
+
+    public void setYsdm(String ysdm) {
         this.ysdm = ysdm;
     }
 
-    public String getYsdm() 
-    {
+    public String getYsdm() {
         return ysdm;
     }
-    public void setZzhdlmc(String zzhdlmc) 
-    {
+
+    public void setZzhdlmc(String zzhdlmc) {
         this.zzhdlmc = zzhdlmc;
     }
 
-    public String getZzhdlmc() 
-    {
+    public String getZzhdlmc() {
         return zzhdlmc;
     }
-    public void setQsdwdm(String qsdwdm) 
-    {
+
+    public void setQsdwdm(String qsdwdm) {
         this.qsdwdm = qsdwdm;
     }
 
-    public String getQsdwdm() 
-    {
+    public String getQsdwdm() {
         return qsdwdm;
     }
-    public void setQsdwmc(String qsdwmc) 
-    {
+
+    public void setQsdwmc(String qsdwmc) {
         this.qsdwmc = qsdwmc;
     }
 
-    public String getQsdwmc() 
-    {
+    public String getQsdwmc() {
         return qsdwmc;
     }
-    public void setZldwdm(String zldwdm) 
-    {
+
+    public void setZldwdm(String zldwdm) {
         this.zldwdm = zldwdm;
     }
 
-    public String getZldwdm() 
-    {
+    public String getZldwdm() {
         return zldwdm;
     }
-    public void setZldwmc(String zldwmc) 
-    {
+
+    public void setZldwmc(String zldwmc) {
         this.zldwmc = zldwmc;
     }
 
-    public String getZldwmc() 
-    {
+    public String getZldwmc() {
         return zldwmc;
     }
-    public void setXzgdlydlbm(String xzgdlydlbm) 
-    {
+
+    public void setXzgdlydlbm(String xzgdlydlbm) {
         this.xzgdlydlbm = xzgdlydlbm;
     }
 
-    public String getXzgdlydlbm() 
-    {
+    public String getXzgdlydlbm() {
         return xzgdlydlbm;
     }
-    public void setZzhdlbm(String zzhdlbm) 
-    {
+
+    public void setZzhdlbm(String zzhdlbm) {
         this.zzhdlbm = zzhdlbm;
     }
 
-    public String getZzhdlbm() 
-    {
+    public String getZzhdlbm() {
         return zzhdlbm;
     }
-    public void setXzgdlydlmc(String xzgdlydlmc) 
-    {
+
+    public void setXzgdlydlmc(String xzgdlydlmc) {
         this.xzgdlydlmc = xzgdlydlmc;
     }
 
-    public String getXzgdlydlmc() 
-    {
+    public String getXzgdlydlmc() {
         return xzgdlydlmc;
     }
-    public void setXzgdmj(Long xzgdmj) 
-    {
+
+    public void setXzgdmj(Long xzgdmj) {
         this.xzgdmj = xzgdmj;
     }
 
-    public Long getXzgdmj() 
-    {
+    public Long getXzgdmj() {
         return xzgdmj;
     }
-    public void setXzgddb(String xzgddb) 
-    {
+
+    public void setXzgddb(String xzgddb) {
         this.xzgddb = xzgddb;
     }
 
-    public String getXzgddb() 
-    {
+    public String getXzgddb() {
         return xzgddb;
     }
-    public void setXzgdlyxm(String xzgdlyxm) 
-    {
+
+    public void setXzgdlyxm(String xzgdlyxm) {
         this.xzgdlyxm = xzgdlyxm;
     }
 
-    public String getXzgdlyxm() 
-    {
+    public String getXzgdlyxm() {
         return xzgdlyxm;
     }
 
@@ -403,35 +435,35 @@ public class TQytdzzXzgd extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("geom", getGeom())
-            .append("tbbh", getTbbh())
-            .append("qsxz", getQsxz())
-            .append("tbmj", getTbmj())
-            .append("kcdlbm", getKcdlbm())
-            .append("kcxs", getKcxs())
-            .append("kcmj", getKcmj())
-            .append("tbdlmj", getTbdlmj())
-            .append("gdlx", getGdlx())
-            .append("gdpdjb", getGdpdjb())
-            .append("frdbs", getFrdbs())
-            .append("czcsxm", getCzcsxm())
-            .append("sjnf", getSjnf())
-            .append("bz", getBz())
-            .append("bsm", getBsm())
-            .append("ysdm", getYsdm())
-            .append("zzhdlmc", getZzhdlmc())
-            .append("qsdwdm", getQsdwdm())
-            .append("qsdwmc", getQsdwmc())
-            .append("zldwdm", getZldwdm())
-            .append("zldwmc", getZldwmc())
-            .append("xzgdlydlbm", getXzgdlydlbm())
-            .append("zzhdlbm", getZzhdlbm())
-            .append("xzgdlydlmc", getXzgdlydlmc())
-            .append("xzgdmj", getXzgdmj())
-            .append("xzgddb", getXzgddb())
-            .append("xzgdlyxm", getXzgdlyxm())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("geom", getGeom())
+                .append("tbbh", getTbbh())
+                .append("qsxz", getQsxz())
+                .append("tbmj", getTbmj())
+                .append("kcdlbm", getKcdlbm())
+                .append("kcxs", getKcxs())
+                .append("kcmj", getKcmj())
+                .append("tbdlmj", getTbdlmj())
+                .append("gdlx", getGdlx())
+                .append("gdpdjb", getGdpdjb())
+                .append("frdbs", getFrdbs())
+                .append("czcsxm", getCzcsxm())
+                .append("sjnf", getSjnf())
+                .append("bz", getBz())
+                .append("bsm", getBsm())
+                .append("ysdm", getYsdm())
+                .append("zzhdlmc", getZzhdlmc())
+                .append("qsdwdm", getQsdwdm())
+                .append("qsdwmc", getQsdwmc())
+                .append("zldwdm", getZldwdm())
+                .append("zldwmc", getZldwmc())
+                .append("xzgdlydlbm", getXzgdlydlbm())
+                .append("zzhdlbm", getZzhdlbm())
+                .append("xzgdlydlmc", getXzgdlydlmc())
+                .append("xzgdmj", getXzgdmj())
+                .append("xzgddb", getXzgddb())
+                .append("xzgdlyxm", getXzgdlyxm())
+                .toString();
     }
 }

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/qytdzz/TQytdzzXzgdMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tbbh"    column="tbbh"    />
         <result property="qsxz"    column="qsxz"    />
         <result property="tbmj"    column="tbmj"    />
+        <result property="tbmj_m"    column="tbmj_m"    />
         <result property="kcdlbm"    column="kcdlbm"    />
         <result property="kcxs"    column="kcxs"    />
         <result property="kcmj"    column="kcmj"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTQytdzzXzgdVo">
-        select id, public.st_asewkt(public.st_force2d(geom)) geom, tbbh, qsxz, tbmj, kcdlbm, kcxs, kcmj, tbdlmj, gdlx, gdpdjb, frdbs, czcsxm, sjnf, bz, bsm, ysdm, zzhdlmc, qsdwdm, qsdwmc, zldwdm, zldwmc, xzgdlydlbm, zzhdlbm, xzgdlydlmc, xzgdmj, xzgddb, xzgdlyxm from t_qytdzz_xzgd
+        select id, public.st_asewkt(public.st_force2d(geom)) geom, tbbh, qsxz, tbmj,(tbmj*0.0015) tbmj_m, kcdlbm, kcxs, kcmj, tbdlmj, gdlx, gdpdjb, frdbs, czcsxm, sjnf, bz, bsm, ysdm, zzhdlmc, qsdwdm, qsdwmc, zldwdm, zldwmc, xzgdlydlbm, zzhdlbm, xzgdlydlmc, xzgdmj, xzgddb, xzgdlyxm from t_qytdzz_xzgd
     </sql>
 
     <select id="selectTQytdzzXzgdList" parameterType="TQytdzzXzgd" resultMap="TQytdzzXzgdResult">
@@ -216,7 +217,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSjzlXzgd"  resultType="java.util.Map">
-        select t1.geom ,ROUND(coalesce(area_number::numeric,0),2) area_number,coalesce(count_number::numeric,0) count_number,zzhdlbm,zzhdlmc from (
+        select t1.geom ,ROUND(coalesce(area_number::numeric,0),2) area_number,
+               ROUND(coalesce(area_number::numeric,0)*0.0015,2) area_number_m,coalesce(count_number::numeric,0) count_number,zzhdlbm,zzhdlmc from (
         SELECT  public.st_asewkt(public.st_force2d(public.st_union(geom))) geom,
         public.st_area( public.st_transform(public.st_union(geom),4525)) area_number,
         count(*) count_number, zzhdlbm,zzhdlmc FROM t_qytdzz_xzgd
@@ -230,7 +232,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectSjzlXzgdly"  resultType="java.util.Map">
-        select dlbm,dlmc,geom,ROUND(coalesce(area_number::numeric,0),2) area_number,coalesce(count_number::numeric,0) count_number  from (
+        select dlbm,dlmc,geom,ROUND(coalesce(area_number::numeric,0),2) area_number,
+        ROUND(coalesce(area_number::numeric,0)*0.0015,2) area_number_m,coalesce(count_number::numeric,0) count_number  from (
         select dlbm,dlmc,public.st_asewkt(public.st_force2d(public.st_union(geom))) geom,
             public.st_area( public.st_transform(public.st_union(geom),4525)) area_number,
                count(*) count_number  from (