中途更新1208

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

@@ -38,6 +38,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
@@ -466,6 +468,7 @@ public class SanYaController extends BaseController {
             ztJzdjxzInfoDto.setUseLife(ztJzdjxzResults.getUseLife());
             ztJzdjxzInfoDto.setVolumeRatioCorrection(ztJzdjxzResults.getVolumeRatioCorrection());
             ztJzdjxzInfoDto.setVolumeRatio(ztJzdjxzResults.getVolumeRatio());
+            ztJzdjxzInfoDto.setSdvolumeRatio(ztJzdjxzResults.getSdvolumeRatio());
             ztJzdjxzInfoDto.setAreaConditionCorrection(ztJzdjxzResults.getAreaConditionCorrection());
             ztJzdjxzInfoDto.setSelectAreaConditionCorrectionItem(JSON.parseObject(ztJzdjxzResults.getSelectAreaConditionCorrectionItem(),ZtJzdjxzMjxzsm.class));
             ztJzdjxzInfoDto.setShapeCorrection(ztJzdjxzResults.getShapeCorrection());
@@ -481,9 +484,30 @@ public class SanYaController extends BaseController {
             ztJzdjxzInfoDto.setStreetBuildingArea(ztJzdjxzResults.getStreetBuildingArea());
             ztJzdjxzInfoDto.setStreetBuildingAreaInfo(JSON.parseObject(ztJzdjxzResults.getStreetBuildingAreaInfo(),StreetBuildingAreaInfo.class));
             ztJzdjxzInfoDto.setGrade(ztJzdjxzResults.getGrade());
-            ztJzdjxzInfoDto.setP1AllFloorPrice(ztJzdjxzResults.getP1AllFloorPrice());
-            ztJzdjxzInfoDto.setP2AllFloorPrice(ztJzdjxzResults.getP2AllFloorPrice());
-            ztJzdjxzInfoDto.setPi(ztJzdjxzResults.getPi());
+
+
+            BigDecimal divisor = new BigDecimal("10000.0");
+            BigDecimal defaultValue  = new BigDecimal("0.0");
+
+            try {
+                BigDecimal result = ztJzdjxzResults.getP1AllFloorPrice().divide(divisor, 2, RoundingMode.HALF_UP);
+                ztJzdjxzInfoDto.setP1AllFloorPrice(result);
+            } catch (ArithmeticException e) {
+                ztJzdjxzInfoDto.setP1AllFloorPrice(defaultValue );
+            }
+            try {
+                BigDecimal result = ztJzdjxzResults.getP2AllFloorPrice().divide(divisor, 2, RoundingMode.HALF_UP);
+                ztJzdjxzInfoDto.setP2AllFloorPrice(result);
+            } catch (ArithmeticException e) {
+                ztJzdjxzInfoDto.setP2AllFloorPrice(defaultValue );
+            }
+            try {
+                BigDecimal result = ztJzdjxzResults.getPi().divide(divisor, 2, RoundingMode.HALF_UP);
+                ztJzdjxzInfoDto.setPi(result);
+            } catch (ArithmeticException e) {
+                ztJzdjxzInfoDto.setPi(defaultValue );
+            }
+
             ztJzdjxzInfoDto.setP1AllXS(ztJzdjxzResults.getP1AllXS());
             ztJzdjxzInfoDto.setP2AllXS(ztJzdjxzResults.getP2AllXS());
             ztJzdjxzInfoDto.setPiAllXS(ztJzdjxzResults.getPiAllXS());

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJXZ/GHDK.java

@@ -0,0 +1,25 @@
+
+package com.onemap.sanya.domain.JZDJXZ;
+
+
+public class GHDK {
+
+    private String name;
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

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

@@ -18,7 +18,7 @@ public class GHDKInfo {
     private Geometry geometry;
     private List<layerData> JZDJList;
     private  List<ZytdList> zytdList;
-    private LandUseNatureWrapper landUseNatureWrapper;
+    private List<LandUseNatureWrapper> landUseNatureWrapper;
     public void setId(String id) {
          this.id = id;
      }
@@ -48,11 +48,11 @@ public class GHDKInfo {
     public void setZytdList(List<ZytdList> zytdList) {this.zytdList = zytdList;}
     public List<ZytdList> getZytdList() {return zytdList;}
 
-    public LandUseNatureWrapper getLandUseNatureWrapper() {
+    public List<LandUseNatureWrapper> getLandUseNatureWrapper() {
         return landUseNatureWrapper;
     }
 
-    public void setLandUseNatureWrapper(LandUseNatureWrapper landUseNatureWrapper) {
+    public void setLandUseNatureWrapper(List<LandUseNatureWrapper> landUseNatureWrapper) {
         this.landUseNatureWrapper = landUseNatureWrapper;
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJXZ/MaxFloorPriceRequestDto.java

@@ -2,7 +2,7 @@
  * @Author:
  * @Date: 2025-07-29 16:02:58
  * @LastEditors: 
- * @LastEditTime: 2025-07-29 16:06:00
+ * @LastEditTime: 2025-08-27 10:45:33
  * @FilePath: onemap-modules/onemap-sanya/src/main/java/com/onemap/sanya/domain/JZDJXZ/MaxFloorPriceRequestDto.java
  * @Description: 这是默认设置, 可以在设置》工具》File Description中进行配置
  */
@@ -19,13 +19,13 @@ public class MaxFloorPriceRequestDto {
         ProjectScope = projectScope;
     }
 
-    public GHDKType landUseType;
+    public GHDK landUseType;
 
-    public void setLandUseType(GHDKType landUseType) {
+    public void setLandUseType(GHDK landUseType) {
         this.landUseType = landUseType;
     }
 
-    public GHDKType getLandUseType() {
+    public GHDK getLandUseType() {
         return landUseType;
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJXZ/ProjectScopeAndDJDto.java

@@ -0,0 +1,31 @@
+/**
+ * @Author:
+ * @Date: 2025-08-04 17:45:04
+ * @LastEditors: 
+ * @LastEditTime: 2025-09-01 11:47:58
+ * @FilePath: onemap-modules/onemap-sanya/src/main/java/com/onemap/sanya/domain/JZDJXZ/ProjectScopeAndDJDto.java
+ * @Description: 这是默认设置, 可以在设置》工具》File Description中进行配置
+ */
+package com.onemap.sanya.domain.JZDJXZ;
+
+public class ProjectScopeAndDJDto {
+    public String ProjectScope ;
+
+    public String getProjectScope() {
+        return ProjectScope;
+    }
+
+    public void setProjectScope(String projectScope) {
+        ProjectScope = projectScope;
+    }
+
+    public String TDYTName;
+
+    public String getTDYTName() {
+        return TDYTName;
+    }
+
+    public void setTDYTName(String TDYTName) {
+        this.TDYTName = TDYTName;
+    }
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJXZ/ZtJzdjxzInfoDto.java

@@ -137,6 +137,10 @@ public class ZtJzdjxzInfoDto extends BaseEntity
     @Excel(name = "容积率参数")
     @JsonProperty("volumeRatio")
     private Float volumeRatio;
+    /** 设定容积率类型 */
+    @Excel(name = "设定容积率类型")
+    @JsonProperty("sdvolumeRatio")
+    private String sdvolumeRatio;
 
     /** 面积状况修正系数 */
     @Excel(name = "面积状况修正系数")
@@ -216,12 +220,12 @@ public class ZtJzdjxzInfoDto extends BaseEntity
     /** 无路线价部分基准地价 */
     @Excel(name = "土地等级")
     @JsonProperty("P1AllFloorPrice")
-    private Float P1AllFloorPrice;
+    private BigDecimal P1AllFloorPrice;
 
     /** 路线价部分基准地价 */
     @Excel(name = "土地等级")
     @JsonProperty("P2AllFloorPrice")
-    private Float P2AllFloorPrice;
+    private BigDecimal P2AllFloorPrice;
 
     /** 总地价 */
     @Excel(name = "土地等级")

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

@@ -5,12 +5,22 @@ import java.util.List;
 
 
 public class landUseNatureRelation {
-
+    private String id;
     private String tdyt;
-    private List<GHDKType> GHDKType;
+    private String xzxs;
+    private List<GHDK> GHDK;
     private List<Layerinfo> layerinfo;
     private List<kffy> kffys;
     private List<landUseNatureRelation> children;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public void setTdyt(String tdyt) {
          this.tdyt = tdyt;
      }
@@ -18,12 +28,21 @@ public class landUseNatureRelation {
          return tdyt;
      }
 
-    public void setGHDKType(List<GHDKType> GHDKType) {
-         this.GHDKType = GHDKType;
-     }
-     public List<GHDKType> getGHDKType() {
-         return GHDKType;
-     }
+    public String getXzxs() {
+        return xzxs;
+    }
+
+    public void setXzxs(String xzxs) {
+        this.xzxs = xzxs;
+    }
+
+    public List<com.onemap.sanya.domain.JZDJXZ.GHDK> getGHDK() {
+        return GHDK;
+    }
+
+    public void setGHDK(List<com.onemap.sanya.domain.JZDJXZ.GHDK> GHDK) {
+        this.GHDK = GHDK;
+    }
 
     public void setLayerinfo(List<Layerinfo> layerinfo) {
          this.layerinfo = layerinfo;

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/JZDJXZ/zTJzdjxzInfoDto/SelectLandUseType.java

@@ -2,7 +2,7 @@
  * @Author:
  * @Date: 2025-08-06 16:46:57
  * @LastEditors: 
- * @LastEditTime: 2025-08-06 17:09:37
+ * @LastEditTime: 2025-08-27 14:44:24
  * @FilePath: onemap-modules/onemap-sanya/src/main/java/com/onemap/sanya/domain/JZDJXZ/zTJzdjxzInfoDto/SelectLandUseType.java
  * @Description: 这是默认设置, 可以在设置》工具》File Description中进行配置
  */
@@ -11,11 +11,11 @@ package com.onemap.sanya.domain.JZDJXZ.zTJzdjxzInfoDto;
 import java.util.List;
 public class SelectLandUseType
 {
-    private String ydxz;
+//    private String ydxz;
 
-    private String ydxzdl;
+//    private String ydxzdl;
 
-    private List<Xfyt> xfyt;
+//    private List<Xfyt> xfyt;
 
     private String toptdyt;
 
@@ -25,24 +25,34 @@ public class SelectLandUseType
 
     private double mj;
 
-    public void setYdxz(String ydxz){
-        this.ydxz = ydxz;
+    private String xzxs;
+    private String        tdyt;
+    private String maxrjl;
+
+    public String getXzxs() {
+        return xzxs;
     }
-    public String getYdxz(){
-        return this.ydxz;
+
+    public void setXzxs(String xzxs) {
+        this.xzxs = xzxs;
     }
-    public void setYdxzdl(String ydxzdl){
-        this.ydxzdl = ydxzdl;
+
+    public String getMaxrjl() {
+        return maxrjl;
     }
-    public String getYdxzdl(){
-        return this.ydxzdl;
+
+    public void setMaxrjl(String maxrjl) {
+        this.maxrjl = maxrjl;
     }
-    public void setXfyt(List<Xfyt> xfyt){
-        this.xfyt = xfyt;
+
+    public String getTdyt() {
+        return tdyt;
     }
-    public List<Xfyt> getXfyt(){
-        return this.xfyt;
+
+    public void setTdyt(String tdyt) {
+        this.tdyt = tdyt;
     }
+
     public void setToptdyt(String toptdyt){
         this.toptdyt = toptdyt;
     }

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

@@ -42,6 +42,10 @@ public class ZtJzdjxzJzdjqyysxzxszbsm extends BaseEntity
     @Excel(name = "因子层")
     private String factorSub;
 
+    /** 土地用途 */
+    @Excel(name = "土地用途")
+    private String tdytType;
+
     /** 因子定义 */
     @Excel(name = "因子定义")
     private String factorSubDefinition;

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

@@ -133,6 +133,11 @@ public class ZtJzdjxzResults extends BaseEntity
     @JsonProperty("volumeRatio")
     private Float volumeRatio;
 
+    /** 设定容积率类型 */
+    @Excel(name = "设定容积率类型")
+    @JsonProperty("sdvolumeRatio")
+    private String sdvolumeRatio;
+
     /** 面积状况修正系数 */
     @Excel(name = "面积状况修正系数")
     @JsonProperty("areaConditionCorrection")
@@ -213,12 +218,12 @@ public class ZtJzdjxzResults extends BaseEntity
     /** 无路线价的总楼面价 */
     @Excel(name = "无路线价的总楼面价")
     @JsonProperty("P1AllFloorPrice")
-    private Float P1AllFloorPrice;
+    private BigDecimal P1AllFloorPrice;
 
     /** 有路线价的总楼面价 */
     @Excel(name = "有路线价的总楼面价")
     @JsonProperty("P2AllFloorPrice")
-    private Float P2AllFloorPrice;
+    private BigDecimal P2AllFloorPrice;
 
     /** 楼面总价 */
     @Excel(name = "楼面总价")

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

@@ -31,6 +31,10 @@ public class ZtJzdjxzRjlxs extends BaseEntity
     @Excel(name = "修正系数")
     private BigDecimal xzxs;
 
+    /** 设定容积率 */
+    @Excel(name = "设定容积率")
+    private String sdrjlType;
+
     public void setNvfid(String nvfid) 
     {
         this.nvfid = nvfid;
@@ -68,6 +72,14 @@ public class ZtJzdjxzRjlxs extends BaseEntity
         return xzxs;
     }
 
+    public String getSdrjlType() {
+        return sdrjlType;
+    }
+
+    public void setSdrjlType(String sdrjlType) {
+        this.sdrjlType = sdrjlType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -75,6 +87,7 @@ public class ZtJzdjxzRjlxs extends BaseEntity
             .append("tdytType", getTdytType())
             .append("rjlfw", getRjlfw())
             .append("xzxs", getXzxs())
+                .append("sdrjlType", getSdrjlType())
             .toString();
     }
 }