Эх сурвалжийг харах

中图代码更新,报错先行解决,让系统运行起来,后续在要中图代码。删除无用的类

DESKTOP-2K9OVK9\siwei 1 сар өмнө
parent
commit
1dd19294da

+ 2 - 2
onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/JZDJAnalyseController.java

@@ -101,7 +101,7 @@ public class JZDJAnalyseController extends BaseController {
             }
             GHDKInfo ghdkInfo = new GHDKInfo();
             ghdkInfo.setId(UUID.randomUUID().toString());
-            List<FldInfo> fldInfos = getFieldAnnotationJZDJ(ghdk);
+            List<FldInfo> fldInfos = new ArrayList<>();
             List<Data> dataList = new ArrayList<>();
             for (FldInfo fldInfo : fldInfos) {
                 Data data = new Data();
@@ -382,7 +382,7 @@ public class JZDJAnalyseController extends BaseController {
      * @throws Exception
      */
     public List<Data> combinationData(Object dataInfo) throws Exception {
-        List<FldInfo> fldInfos = getFieldAnnotationJZDJ(dataInfo);
+        List<FldInfo> fldInfos = new ArrayList<>();
         List<Data> dataList = new ArrayList<>();
         for (FldInfo fldInfo : fldInfos) {
             Data data = new Data();

+ 0 - 279
onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/ZtZdCqReultList.java

@@ -1,279 +0,0 @@
-package com.onemap.sanya.domain.business;
-
-import com.deepoove.poi.expression.Name;
-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;
-
-import java.util.List;
-
-/**
- * 征地补偿拆迁分析结果对象 zt_zd_cq_reult_list
- *
- * @author ruoyi
- * @date 2024-08-21
- */
-public class ZtZdCqReultList extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private String id;
-
-    /** 房屋数量 */
-    @Excel(name = "房屋数量")
-    private Integer count;
-
-    /** 总建筑面积(平方米) */
-    @Excel(name = "总建筑面积(平方米)")
-    private Double totalJZMJ;
-
-    /** 总赔偿(万元) */
-    @Excel(name = "总赔偿(万元)")
-    private Double totalPay;
-
-    /** 平均补偿价(元/平方米) */
-    @Excel(name = "平均补偿价(元/平方米)")
-    private Double average;
-
-    /** 国有列表 */
-    @Excel(name = "国有列表")
-    private String gyList;
-
-    private List<FWItem> gyFWData;
-
-
-    /** 相关图元信息 */
-    @Excel(name = "相关图元信息")
-    private String gyfeatures;
-
-    /** 所属项目 */
-    @Excel(name = "所属项目")
-    private String projectId;
-
-    /** 国有建筑面积 */
-    @Excel(name = "国有建筑面积")
-    private Double gyJZMJ;
-
-    /** 集体建筑面积 */
-    @Excel(name = "集体建筑面积")
-    private Double jtJZMJ;
-    /**国有补偿8 */
-    private Double gyPay;
-    /** 集体补偿 */
-
-    private Double jtPay;
-    /** 国有建筑数量 */
-    @Excel(name = "国有建筑数量")
-    private Integer gyCount;
-
-    /** 集体建筑数量 */
-    @Excel(name = "集体建筑数量")
-    private Integer jtCount;
-
-    /** 集体列表 */
-    @Excel(name = "集体列表")
-    private String jtList;
-      private List<FWItem> jtFWData;
-          /** 相关图元信息 */
-    @Excel(name = "相关图元信息")
-    private String jtfeatures;
-
-    /** 字段信息 */
-    @Excel(name = "字段信息")
-    private String fieldInfos;
-
-    public void setId(String id)
-    {
-        this.id = id;
-    }
-
-    public String getId()
-    {
-        return id;
-    }
-    public void setCount(Integer count)
-    {
-        this.count = count;
-    }
-
-    public Integer getCount()
-    {
-        return count;
-    }
-    public void setTotalJZMJ(Double totalJZMJ)
-    {
-        this.totalJZMJ = totalJZMJ;
-    }
-
-    public Double getTotalJZMJ()
-    {
-        return totalJZMJ;
-    }
-    public void setTotalPay(Double totalPay)
-    {
-        this.totalPay = totalPay;
-    }
-
-    public Double getTotalPay()
-    {
-        return totalPay;
-    }
-    public void setAverage(Double average)
-    {
-        this.average = average;
-    }
-
-    public Double getAverage()
-    {
-        return average;
-    }
-    public void setGyList(String gyList)
-    {
-        this.gyList = gyList;
-    }
-
-    public String getGyList()
-    {
-        return gyList;
-    }
-    public void setGyfeatures(String gyfeatures)
-    {
-        this.gyfeatures = gyfeatures;
-    }
-
-    public String getGyfeatures()
-    {
-        return gyfeatures;
-    }
-    public void setProjectId(String projectId)
-    {
-        this.projectId = projectId;
-    }
-
-    public String getProjectId()
-    {
-        return projectId;
-    }
-    public void setGyJZMJ(Double gyJZMJ)
-    {
-        this.gyJZMJ = gyJZMJ;
-    }
-
-    public Double getGyJZMJ()
-    {
-        return gyJZMJ;
-    }
-    public void setJtJZMJ(Double jtJZMJ)
-    {
-        this.jtJZMJ = jtJZMJ;
-    }
-
-    public Double getJtJZMJ()
-    {
-        return jtJZMJ;
-    }
-    public void setGyCount(Integer gyCount)
-    {
-        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;
-    }
-    public void setJtCount(Integer jtCount)
-    {
-        this.jtCount = jtCount;
-    }
-
-    public Integer getJtCount()
-    {
-        return jtCount;
-    }
-    public void setJtList(String jtList)
-    {
-        this.jtList = jtList;
-    }
-
-    public String getJtList()
-    {
-        return jtList;
-    }
-    public void setJtfeatures(String jtfeatures)
-    {
-        this.jtfeatures = jtfeatures;
-    }
-
-    public String getJtfeatures()
-    {
-        return jtfeatures;
-    }
-    public void setFieldInfos(String fieldInfos)
-    {
-        this.fieldInfos = fieldInfos;
-    }
-
-    public String getFieldInfos()
-    {
-        return fieldInfos;
-    }
-
-    public List<FWItem> getGyFWData() {
-        return gyFWData;
-    }
-
-    public List<FWItem> getJtFWData() {
-        return jtFWData;
-    }
-
-    public void setGyFWData(List<FWItem> gyFWData) {
-        this.gyFWData = gyFWData;
-    }
-
-    public void setJtFWData(List<FWItem> jtFWData) {
-        this.jtFWData = jtFWData;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("count", getCount())
-                .append("totalJZMJ", getTotalJZMJ())
-                .append("totalPay", getTotalPay())
-                .append("average", getAverage())
-                .append("gyList", getGyList())
-                .append("gyfeatures", getGyfeatures())
-                .append("projectId", getProjectId())
-                .append("gyJZMJ", getGyJZMJ())
-                .append("jtJZMJ", getJtJZMJ())
-                .append("gyCount", getGyCount())
-                .append("jtCount", getJtCount())
-                .append("jtList", getJtList())
-                .append("jtfeatures", getJtfeatures())
-                .append("fieldInfos", getFieldInfos())
-                .toString();
-    }
-}
-