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> 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(@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 = "文件集合")