From 64cb394f1efb2a00ea9b8c78b19a2e524c851a88 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Wed, 13 Nov 2024 17:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=BA=93=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0APP=E9=9C=80=E8=A6=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9B=E8=8E=B7=E5=8F=96=E4=B8=BB=E5=89=AF=E5=9D=9D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyt/controller/AttDamBaseController.java  |  6 ++
 .../gunshi/project/xyt/model/AttResBase.java  | 79 ++++++++++++++++++-
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java b/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java
index 21aa05e..3e80c30 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java
@@ -95,6 +95,12 @@ public class AttDamBaseController extends AbstractCommonFileController{
         return R.ok(service.lambdaQuery().list());
     }
 
+    @Operation(summary = "获取主副坝信息")
+    @GetMapping("/info")
+    public R<List<AttDamBase>> info(@Schema(name = "isMain",description = "是否主坝（0否 1是）") @RequestParam(name = "isMain") Integer isMain) {
+        return R.ok(service.lambdaQuery().eq(AttDamBase::getIsMain,isMain).list());
+    }
+
     @Operation(summary = "分页")
     @PostMapping("/page")
     public R<Page<AttDamBase>> page(@RequestBody @Validated GeneralDataPage page)  {
diff --git a/src/main/java/com/gunshi/project/xyt/model/AttResBase.java b/src/main/java/com/gunshi/project/xyt/model/AttResBase.java
index 41fc579..36a3abe 100644
--- a/src/main/java/com/gunshi/project/xyt/model/AttResBase.java
+++ b/src/main/java/com/gunshi/project/xyt/model/AttResBase.java
@@ -505,7 +505,7 @@ public class AttResBase implements Serializable {
         */
         @TableField(value="design_irr_area")
         @Schema(description="设计灌溉面积(亩)")
-        private Integer designIrrArea;
+        private BigDecimal designIrrArea;
 
         /**
         * actual_irr_area
@@ -521,6 +521,83 @@ public class AttResBase implements Serializable {
         @Schema(description="供水效益")
         private String benefit;
 
+        /**
+         * 全流域面积
+         */
+        @TableField(value="bas_area")
+        @Schema(description="全流域面积")
+        private BigDecimal basArea;
+
+        /**
+         * 坝址以上主河床长度
+         */
+        @TableField(value="wat_river_len")
+        @Schema(description="坝址以上主河床长度")
+        private BigDecimal watRiverLen;
+
+        /**
+         * 坝址以上主河床坡降
+         */
+        @TableField(value="wat_river_slope")
+        @Schema(description="坝址以上主河床坡降")
+        private BigDecimal watRiverSlope;
+
+        /**
+         * 多年平均降雨量（坝址处）
+         */
+        @TableField(value="annual_avg_drp")
+        @Schema(description="多年平均降雨量（坝址处）")
+        private BigDecimal annualAvgDrp;
+
+        /**
+         * 多年平均气温
+         */
+        @TableField(value="annual_avg_tem")
+        @Schema(description="多年平均气温")
+        private BigDecimal annualAvgTem;
+
+        /**
+         * 保护人口(人)
+         */
+        @TableField(value="protect_population")
+        @Schema(description="保护人口(人)")
+        private Double protectPopulation;
+
+        /**
+         * 保护农田(亩)
+         */
+        @TableField(value="protect_farmland")
+        @Schema(description="保护农田(亩)")
+        private Double protectFarmland;
+
+        /**
+         * 地震基本烈度Ⅰ 1  Ⅱ 2   Ⅲ 3 Ⅳ 4  Ⅴ 5 VI 6
+         */
+        @TableField(value="seismic_intensity")
+        @Schema(description="地震基本烈度Ⅰ 1  Ⅱ 2   Ⅲ 3 Ⅳ 4  Ⅴ 5 VI 6")
+        private Integer seismicIntensity;
+
+        /**
+         * 地震动参数设计值
+         */
+        @TableField(value="seismic_parm")
+        @Schema(description="地震动参数设计值")
+        private BigDecimal seismicParm;
+
+        /**
+         * 设计洪水标准及洪峰流量
+         */
+        @TableField(value="des_flood_peak_flow")
+        @Schema(description="设计洪水标准及洪峰流量")
+        private BigDecimal desFloodPeakFlow;
+
+        /**
+         * 校核洪水标准及洪峰流量
+         */
+        @TableField(value="cal_flood_peak_flow")
+        @Schema(description="校核洪水标准及洪峰流量")
+        private BigDecimal calFloodPeakFlow;
+
 
         @TableField(exist = false)
         @Schema(description = "文件集合")