修改EngineeringDrainageService
parent
abc51e4709
commit
4252d45330
|
|
@ -6,7 +6,7 @@ import com.gunshi.project.xyt.entity.dto.*;
|
|||
import com.gunshi.project.xyt.model.*;
|
||||
import com.gunshi.project.xyt.service.EngineeringDrainageService;
|
||||
import com.gunshi.project.xyt.so.*;
|
||||
import com.gunshi.project.xyt.validate.markers.Update;
|
||||
import com.gunshi.project.xyt.validate.markers.Insert;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
|
|
@ -34,68 +34,68 @@ public class EngineeringDrainageController {
|
|||
|
||||
@Operation(summary = "新增水库基础信息")
|
||||
@PostMapping("/StRes/insert")
|
||||
public R<String> insertRes(@RequestBody @Validated StResDto stResDto) {
|
||||
public R<String> insertRes(@RequestBody @Validated StResDto stResDto){
|
||||
engineeringDrainageService.insertStRes(stResDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "更新水库的基础信息")
|
||||
@PostMapping("/StRes/update")
|
||||
public R<String> updateStRes(@Validated(Update.class) @RequestBody StResB stResB) {
|
||||
public R<String> updateStRes(@Validated(Insert.class) @RequestBody StResB stResB){
|
||||
engineeringDrainageService.updateStRes(stResB);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "根据水库ID删除水库基本信息")
|
||||
@GetMapping("/StRes/delete")
|
||||
public R<String> deleteStRes(@Parameter(description = "水库ID") @RequestParam("resId") String resId) {
|
||||
public R<String> deleteStRes(@Parameter(description = "水库ID") @RequestParam("resId") String resId){
|
||||
engineeringDrainageService.deleteStRes(resId);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "分页查询水库的基础信息")
|
||||
@PostMapping("/StRes/page")
|
||||
public R<Page<StResB>> pageStRes(@RequestBody @Validated StResPageSo stResPageSo) {
|
||||
public R<Page<StResB>> pageStRes(@RequestBody @Validated StResPageSo stResPageSo){
|
||||
return R.ok(engineeringDrainageService.pageStRes(stResPageSo));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增水库测站关系")
|
||||
@PostMapping("/StResStcdRef/insert")
|
||||
public R<String> insertStResStcdRef(@RequestBody @Validated StResStcdRefDto stResStcdRefDto) {
|
||||
public R<String> insertStResStcdRef(@RequestBody @Validated StResStcdRefDto stResStcdRefDto){
|
||||
engineeringDrainageService.insertStResStcdRef(stResStcdRefDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "更新水库测站关系")
|
||||
@PostMapping("/StResStcdRef/update")
|
||||
public R<String> updateStResStcdRef(@RequestBody @Validated StResStcdRef stResStcdRef) {
|
||||
public R<String> updateStResStcdRef(@RequestBody @Validated StResStcdRef stResStcdRef){
|
||||
engineeringDrainageService.updateStResStcdRef(stResStcdRef);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "删除水库测站关系")
|
||||
@GetMapping("/StResStcdRef/delete")
|
||||
public R<String> deleteStResStcdRef(@Parameter(description = "水库ID") @RequestParam("resId") String resId) {
|
||||
public R<String> deleteStResStcdRef(@Parameter(description = "水库ID") @RequestParam("resId") String resId){
|
||||
engineeringDrainageService.deleteStResStcdRef(resId);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "根据水库ID查询水库测站关系")
|
||||
@GetMapping("/StResStcdRef/queryByResId")
|
||||
public R<StResStcdRef> queryStResStcdRefByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId) {
|
||||
public R<StResStcdRef> queryStResStcdRefByResId(@Parameter(description = "水库ID") @RequestParam("resId")String resId){
|
||||
return R.ok(engineeringDrainageService.queryStResStcdRefByResId(resId));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增库容曲线信息")
|
||||
@PostMapping("/StZvarl/insert")
|
||||
public R<String> insertStZvarl(@RequestBody @Validated StZvarlDto stZvarlDto) {
|
||||
public R<String> insertStZvarl(@RequestBody @Validated StZvarlDto stZvarlDto){
|
||||
engineeringDrainageService.insertStZvarl(stZvarlDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "更新库容曲线信息")
|
||||
@PostMapping("/StZvarl/update")
|
||||
public R<String> updateStZvarl(@RequestBody @Validated StZvarlB stZvarlB) {
|
||||
public R<String> updateStZvarl(@RequestBody @Validated StZvarlB stZvarlB){
|
||||
engineeringDrainageService.updateStZvarl(stZvarlB);
|
||||
return R.ok();
|
||||
}
|
||||
|
|
@ -104,170 +104,170 @@ public class EngineeringDrainageController {
|
|||
@GetMapping("/StZvarl/delete")
|
||||
public R<String> deleteStZvarl(
|
||||
@Parameter(description = "水库ID") @RequestParam("resId") String resId,
|
||||
@Parameter(description = "序号") @RequestParam("ptno") String ptno) {
|
||||
engineeringDrainageService.deleteStZvarl(resId, ptno);
|
||||
@Parameter(description = "序号") @RequestParam("ptno") String ptno){
|
||||
engineeringDrainageService.deleteStZvarl(resId,ptno);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "分页查询库容曲线信息")
|
||||
@PostMapping("/StZvarl/page")
|
||||
public R<Page<StZvarlB>> pageStZvarl(@RequestBody @Validated StZvarlSo stZvarlSo) {
|
||||
public R<Page<StZvarlB>> pageStZvarl(@RequestBody @Validated StZvarlSo stZvarlSo){
|
||||
return R.ok(engineeringDrainageService.pageStZvarl(stZvarlSo));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增水库责任人信息")
|
||||
@PostMapping("/StResPersonRef/insert")
|
||||
public R<String> insertStResPersonRef(@RequestBody @Validated StResPersonRefDto stResPersonRefDto) {
|
||||
public R<String> insertStResPersonRef(@RequestBody @Validated StResPersonRefDto stResPersonRefDto){
|
||||
engineeringDrainageService.insertStResPersonRef(stResPersonRefDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "更新水库责任人关系")
|
||||
@PostMapping("/StResPersonRef/update")
|
||||
public R<String> updateStResPersonRef(@RequestBody @Validated StResPersonRef stResPersonRef) {
|
||||
public R<String> updateStResPersonRef(@RequestBody @Validated StResPersonRef stResPersonRef){
|
||||
engineeringDrainageService.updateStResPersonRef(stResPersonRef);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "删除水库责任人信息")
|
||||
@GetMapping("/StResPersonRef/delete")
|
||||
public R<String> deleteStResPersonRef(@Parameter(description = "水库责任人关系ID") @RequestParam("id") String id) {
|
||||
public R<String> deleteStResPersonRef(@Parameter(description = "水库责任人关系ID") @RequestParam("id") String id){
|
||||
engineeringDrainageService.deleteStResPersonRef(id);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "分页查询水库责任人信息")
|
||||
@PostMapping("/StResPersonRef/page")
|
||||
public R<Page<StResPersonRef>> pageStResPersonRef(StResPersonRefSo stResPersonRefSo) {
|
||||
public R<Page<StResPersonRef>> pageStResPersonRef(@RequestBody @Validated StResPersonRefSo stResPersonRefSo){
|
||||
return R.ok(engineeringDrainageService.pageStResPersonRef(stResPersonRefSo));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增水库附件信息")
|
||||
@PostMapping("/StResFileRef/insert")
|
||||
public R<String> insertStResFileRef(@RequestBody @Validated StResFileRefDto stResFileRefDto) {
|
||||
public R<String> insertStResFileRef(@RequestBody @Validated StResFileRefDto stResFileRefDto){
|
||||
engineeringDrainageService.insertStResFileRef(stResFileRefDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "根据水库附件关系ID删除水库附件信息")
|
||||
@GetMapping("/StResFileRef/delete")
|
||||
public R<String> deleteStResFileRef(@Parameter(description = "水库附件关系ID") @RequestParam("id") String id) {
|
||||
public R<String> deleteStResFileRef(@Parameter(description = "水库附件关系ID") @RequestParam("id") String id){
|
||||
engineeringDrainageService.deleteStResFileRef(id);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "分页查询水库附件")
|
||||
@PostMapping("/StResFileRef/page")
|
||||
public R<Page<StResFileRef>> pageStResFileRef(@RequestBody @Validated StResFileRefSo stResFileRefSo) {
|
||||
public R<Page<StResFileRef>> pageStResFileRef(@RequestBody @Validated StResFileRefSo stResFileRefSo){
|
||||
return R.ok(engineeringDrainageService.pageStResFileRef(stResFileRefSo));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增河流基础信息")
|
||||
@PostMapping("/StRv/insert")
|
||||
public R<String> insertStRv(@RequestBody @Validated StRvDto stRvDto) {
|
||||
public R<String> insertStRv(@RequestBody @Validated StRvDto stRvDto){
|
||||
engineeringDrainageService.insertStRv(stRvDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "更新河流的基础信息")
|
||||
@PostMapping("/StRv/update")
|
||||
public R<String> updateStRv(@RequestBody StRvB stRvB) {
|
||||
public R<String> updateStRv(@RequestBody @Validated StRvB stRvB){
|
||||
engineeringDrainageService.updateStRv(stRvB);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "根据河流ID删除河流信息")
|
||||
@GetMapping("/StRv/delete")
|
||||
public R<String> deleteStRv(@Parameter(description = "河流ID") @RequestParam("rvId") String rvId) {
|
||||
public R<String> deleteStRv(@Parameter(description = "河流ID") @RequestParam("rvId") String rvId){
|
||||
engineeringDrainageService.deleteStRv(rvId);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "分页查询河流基础信息")
|
||||
@PostMapping("/StRv/page")
|
||||
public R<Page<StRvB>> pageStRv(@RequestBody StRvPageSo stRvPageSo) {
|
||||
public R<Page<StRvB>> pageStRv(@RequestBody StRvPageSo stRvPageSo){
|
||||
return R.ok(engineeringDrainageService.pageStRv(stRvPageSo));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增大坝基础信息")
|
||||
@PostMapping("/StDam/insert")
|
||||
public R<String> insertStDam(@RequestBody @Validated StDamDto stDamDto) {
|
||||
public R<String> insertStDam(@RequestBody @Validated StDamDto stDamDto){
|
||||
engineeringDrainageService.insertStDam(stDamDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "更新大坝基础信息")
|
||||
@PostMapping("/StDam/update")
|
||||
public R<String> updateStDam(@RequestBody StDamB stDamB) {
|
||||
public R<String> updateStDam(@RequestBody StDamB stDamB){
|
||||
engineeringDrainageService.updateStDam(stDamB);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "根据大坝ID删除大坝基础信息")
|
||||
@GetMapping("/StDam/delete")
|
||||
public R<String> deleteStDam(@Parameter(description = "大坝ID") @RequestParam("damId") String damId) {
|
||||
public R<String> deleteStDam(@Parameter(description = "大坝ID") @RequestParam("damId") String damId){
|
||||
engineeringDrainageService.deleteStDam(damId);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "分页查询大坝信息")
|
||||
@PostMapping("/StDam/query")
|
||||
public R<Page<StDamB>> PageStDam(@RequestBody @Validated StDamPageSo stDamPageSo) {
|
||||
public R<Page<StDamB>> PageStDam(@RequestBody @Validated StDamPageSo stDamPageSo){
|
||||
return R.ok(engineeringDrainageService.pageStDam(stDamPageSo));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增闸阀基础信息")
|
||||
@PostMapping("/StGate/insert")
|
||||
public R<String> insertStGate(@RequestBody @Validated StGateDto stGateDto) {
|
||||
public R<String> insertStGate(@RequestBody @Validated StGateDto stGateDto){
|
||||
engineeringDrainageService.insertStGate(stGateDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "更新闸阀基础信息")
|
||||
@PostMapping("/StGate/update")
|
||||
public R<String> updateStGate(@RequestBody @Validated StGateB stGateB) {
|
||||
public R<String> updateStGate(@RequestBody @Validated StGateB stGateB){
|
||||
engineeringDrainageService.updateStGate(stGateB);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "根据闸阀ID删除闸阀基础信息")
|
||||
@GetMapping("/StGate/delete")
|
||||
public R<String> deleteStGate(@Parameter(description = "闸阀ID") @RequestParam("gateId") String gateId) {
|
||||
public R<String> deleteStGate(@Parameter(description = "闸阀ID") @RequestParam("gateId") String gateId){
|
||||
engineeringDrainageService.deleteStGate(gateId);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "分页查询闸阀基础信息")
|
||||
@PostMapping("/StGate/page")
|
||||
public R<Page<StGateB>> pageStGate(@RequestBody @Validated StGatePageSo stGatePageSo) {
|
||||
public R<Page<StGateB>> pageStGate(@RequestBody @Validated StGatePageSo stGatePageSo){
|
||||
return R.ok(engineeringDrainageService.pageStGate(stGatePageSo));
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "新增量水堰基础信息")
|
||||
@PostMapping("/StEqpt/insert")
|
||||
public R<String> insertStEqpt(@RequestBody @Validated StEqptDto stEqptDto) {
|
||||
public R<String> insertStEqpt(@RequestBody @Validated StEqptDto stEqptDto){
|
||||
engineeringDrainageService.insertStEqpt(stEqptDto);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "更新量水堰基础信息")
|
||||
@PostMapping("/StEqpt/update")
|
||||
public R<String> updateStEqpt(@RequestBody StEqptB stEqptB) {
|
||||
public R<String> updateStEqpt(@RequestBody StEqptB stEqptB){
|
||||
engineeringDrainageService.updateStEqpt(stEqptB);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "根据量水设施ID删除量水堰基础信息")
|
||||
@Operation(summary = "删除量水堰基础信息")
|
||||
@GetMapping("/StEqpt/delete")
|
||||
public R<String> deleteStEqpt(@Parameter(description = "量水设施ID") @RequestParam("wmeqId") String wmeqId) {
|
||||
public R<String> deleteStEqpt(@Parameter(description = "量水设施ID") @RequestParam("wmeqId") String wmeqId){
|
||||
engineeringDrainageService.deleteStEqpt(wmeqId);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Operation(summary = "根据量水设施ID查询量水堰基础信息")
|
||||
@Operation(summary = "分页查询量水堰信息")
|
||||
@PostMapping("/StEqpt/page")
|
||||
public R<Page<StEqptB>> pageStEqpt(@RequestBody @Validated StEqptPageSo stEqptPageSo) {
|
||||
public R<Page<StEqptB>> pageStEqpt(@RequestBody @Validated StEqptPageSo stEqptPageSo){
|
||||
return R.ok(engineeringDrainageService.pageStEqpt(stEqptPageSo));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,19 +7,21 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
|||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.gunshi.project.xyt.validate.markers.Update;
|
||||
import com.gunshi.project.xyt.validate.markers.Insert;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 水库的基础信息
|
||||
*/
|
||||
@Schema(description = "水库的基础信息")
|
||||
@Schema(description="水库的基础信息")
|
||||
@Data
|
||||
@TableName(value = "dbo.ST_RES_B")
|
||||
public class StResB implements Serializable {
|
||||
|
|
@ -27,242 +29,242 @@ public class StResB implements Serializable {
|
|||
* 水库id
|
||||
*/
|
||||
@TableId(value = "RES_ID", type = IdType.INPUT)
|
||||
@Schema(description = "水库id")
|
||||
@Schema(description="水库id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
@NotEmpty(groups = Update.class)
|
||||
@NotNull(groups = Insert.class)
|
||||
private Long resId;
|
||||
|
||||
/**
|
||||
* 水库代码
|
||||
*/
|
||||
@TableField(value = "RES_CODE")
|
||||
@Schema(description = "水库代码")
|
||||
@Schema(description="水库代码")
|
||||
private String resCode;
|
||||
|
||||
/**
|
||||
* 水库名称
|
||||
*/
|
||||
@TableField(value = "RES_NAME")
|
||||
@Schema(description = "水库名称")
|
||||
@Schema(description="水库名称")
|
||||
private String resName;
|
||||
|
||||
/**
|
||||
* 行政区划编码
|
||||
*/
|
||||
@TableField(value = "ADDVCD")
|
||||
@Schema(description = "行政区划编码")
|
||||
@Schema(description="行政区划编码")
|
||||
private String addvcd;
|
||||
|
||||
/**
|
||||
* 经度
|
||||
*/
|
||||
@TableField(value = "LGTD")
|
||||
@Schema(description = "经度")
|
||||
@Schema(description="经度")
|
||||
private BigDecimal lgtd;
|
||||
|
||||
/**
|
||||
* 纬度
|
||||
*/
|
||||
@TableField(value = "LTTD")
|
||||
@Schema(description = "纬度")
|
||||
@Schema(description="纬度")
|
||||
private BigDecimal lttd;
|
||||
|
||||
/**
|
||||
* 堰顶高程
|
||||
*/
|
||||
@TableField(value = "WCRSTEL")
|
||||
@Schema(description = "堰顶高程")
|
||||
@Schema(description="堰顶高程")
|
||||
private BigDecimal wcrstel;
|
||||
|
||||
/**
|
||||
* 堰顶宽度
|
||||
*/
|
||||
@TableField(value = "WCRESTWD")
|
||||
@Schema(description = "堰顶宽度")
|
||||
@Schema(description="堰顶宽度")
|
||||
private BigDecimal wcrestwd;
|
||||
|
||||
/**
|
||||
* 坝顶高程
|
||||
*/
|
||||
@TableField(value = "DMTPEL")
|
||||
@Schema(description = "坝顶高程")
|
||||
@Schema(description="坝顶高程")
|
||||
private BigDecimal dmtpel;
|
||||
|
||||
/**
|
||||
* 最大坝高
|
||||
*/
|
||||
@TableField(value = "DMHT")
|
||||
@Schema(description = "最大坝高")
|
||||
@Schema(description="最大坝高")
|
||||
private BigDecimal dmht;
|
||||
|
||||
/**
|
||||
* 坝顶长度
|
||||
*/
|
||||
@TableField(value = "DMTPLEN")
|
||||
@Schema(description = "坝顶长度")
|
||||
@Schema(description="坝顶长度")
|
||||
private BigDecimal dmtplen;
|
||||
|
||||
/**
|
||||
* 坝顶宽度
|
||||
*/
|
||||
@TableField(value = "DATPWD")
|
||||
@Schema(description = "坝顶宽度")
|
||||
@Schema(description="坝顶宽度")
|
||||
private BigDecimal datpwd;
|
||||
|
||||
/**
|
||||
* 设计洪水位
|
||||
*/
|
||||
@TableField(value = "DSFLLV")
|
||||
@Schema(description = "设计洪水位")
|
||||
@Schema(description="设计洪水位")
|
||||
private BigDecimal dsfllv;
|
||||
|
||||
/**
|
||||
* 校核洪水位
|
||||
*/
|
||||
@TableField(value = "CHFLLV")
|
||||
@Schema(description = "校核洪水位")
|
||||
@Schema(description="校核洪水位")
|
||||
private BigDecimal chfllv;
|
||||
|
||||
/**
|
||||
* 正常蓄水位
|
||||
*/
|
||||
@TableField(value = "NORM_WAT_LEV")
|
||||
@Schema(description = "正常蓄水位")
|
||||
@Schema(description="正常蓄水位")
|
||||
private BigDecimal normWatLev;
|
||||
|
||||
/**
|
||||
* 死水位
|
||||
*/
|
||||
@TableField(value = "DEAD_LEV")
|
||||
@Schema(description = "死水位")
|
||||
@Schema(description="死水位")
|
||||
private BigDecimal deadLev;
|
||||
|
||||
/**
|
||||
* 总库容
|
||||
*/
|
||||
@TableField(value = "TOT_CAP")
|
||||
@Schema(description = "总库容")
|
||||
@Schema(description="总库容")
|
||||
private BigDecimal totCap;
|
||||
|
||||
/**
|
||||
* 防洪库容
|
||||
*/
|
||||
@TableField(value = "FLCO_CAP")
|
||||
@Schema(description = "防洪库容")
|
||||
@Schema(description="防洪库容")
|
||||
private BigDecimal flcoCap;
|
||||
|
||||
/**
|
||||
* 兴利库容
|
||||
*/
|
||||
@TableField(value = "BEN_RES_CAP")
|
||||
@Schema(description = "兴利库容")
|
||||
@Schema(description="兴利库容")
|
||||
private BigDecimal benResCap;
|
||||
|
||||
/**
|
||||
* 已淤积库容
|
||||
*/
|
||||
@TableField(value = "SDMNT_CAP")
|
||||
@Schema(description = "已淤积库容")
|
||||
@Schema(description="已淤积库容")
|
||||
private BigDecimal sdmntCap;
|
||||
|
||||
/**
|
||||
* 死库容
|
||||
*/
|
||||
@TableField(value = "DEAD_CAP")
|
||||
@Schema(description = "死库容")
|
||||
@Schema(description="死库容")
|
||||
private BigDecimal deadCap;
|
||||
|
||||
/**
|
||||
* 汛限水位
|
||||
*/
|
||||
@TableField(value = "FL_LOW_LIM_LEV")
|
||||
@Schema(description = "汛限水位")
|
||||
@Schema(description="汛限水位")
|
||||
private BigDecimal flLowLimLev;
|
||||
|
||||
/**
|
||||
* 多年平均降水量
|
||||
*/
|
||||
@TableField(value = "AVANPR")
|
||||
@Schema(description = "多年平均降水量")
|
||||
@Schema(description="多年平均降水量")
|
||||
private BigDecimal avanpr;
|
||||
|
||||
/**
|
||||
* 多年平均径流量
|
||||
*/
|
||||
@TableField(value = "DAAD_MUL_AVER_RUOF")
|
||||
@Schema(description = "多年平均径流量")
|
||||
@Schema(description="多年平均径流量")
|
||||
private BigDecimal daadMulAverRuof;
|
||||
|
||||
/**
|
||||
* 集雨面积
|
||||
*/
|
||||
@TableField(value = "WAT_SHED_AREA")
|
||||
@Schema(description = "集雨面积")
|
||||
@Schema(description="集雨面积")
|
||||
private BigDecimal watShedArea;
|
||||
|
||||
/**
|
||||
* 开工日期
|
||||
*/
|
||||
@TableField(value = "START_DATE")
|
||||
@Schema(description = "开工日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@Schema(description="开工日期")
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date startDate;
|
||||
|
||||
/**
|
||||
* 竣工日期
|
||||
*/
|
||||
@TableField(value = "COMP_DATE")
|
||||
@Schema(description = "竣工日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@Schema(description="竣工日期")
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date compDate;
|
||||
|
||||
/**
|
||||
* 归口管理部门
|
||||
*/
|
||||
@TableField(value = "ADM_DEP")
|
||||
@Schema(description = "归口管理部门")
|
||||
@Schema(description="归口管理部门")
|
||||
private String admDep;
|
||||
|
||||
/**
|
||||
* 所在河流(水系)名称
|
||||
*/
|
||||
@TableField(value = "HNNM")
|
||||
@Schema(description = "所在河流(水系)名称")
|
||||
@Schema(description="所在河流(水系)名称")
|
||||
private String hnnm;
|
||||
|
||||
/**
|
||||
* 历史最高水位
|
||||
*/
|
||||
@TableField(value = "HSHGWTLV")
|
||||
@Schema(description = "历史最高水位")
|
||||
@Schema(description="历史最高水位")
|
||||
private BigDecimal hshgwtlv;
|
||||
|
||||
/**
|
||||
* 调节性能
|
||||
*/
|
||||
@TableField(value = "AJST_PRFR")
|
||||
@Schema(description = "调节性能")
|
||||
@Schema(description="调节性能")
|
||||
private String ajstPrfr;
|
||||
|
||||
/**
|
||||
* 溢洪道进口底高程
|
||||
*/
|
||||
@TableField(value = "YHDMEL")
|
||||
@Schema(description = "溢洪道进口底高程")
|
||||
@Schema(description="溢洪道进口底高程")
|
||||
private BigDecimal yhdmel;
|
||||
|
||||
/**
|
||||
* 溢洪道设计泄量
|
||||
*/
|
||||
@TableField(value = "YHDDSFL")
|
||||
@Schema(description = "溢洪道设计泄量")
|
||||
@Schema(description="溢洪道设计泄量")
|
||||
private BigDecimal yhddsfl;
|
||||
|
||||
/**
|
||||
* 水库规模 dict_id
|
||||
*/
|
||||
@TableField(value = "ENG_SCAL")
|
||||
@Schema(description = "水库规模 dict_id")
|
||||
@Schema(description="水库规模 dict_id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long engScal;
|
||||
|
||||
|
|
@ -270,21 +272,21 @@ public class StResB implements Serializable {
|
|||
* 备注
|
||||
*/
|
||||
@TableField(value = "NOTE")
|
||||
@Schema(description = "备注")
|
||||
@Schema(description="备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 水库所在位置
|
||||
*/
|
||||
@TableField(value = "RES_LOC")
|
||||
@Schema(description = "水库所在位置")
|
||||
@Schema(description="水库所在位置")
|
||||
private String resLoc;
|
||||
|
||||
/**
|
||||
* 工程等别 dict_id
|
||||
*/
|
||||
@TableField(value = "ENG_GRAD")
|
||||
@Schema(description = "工程等别 dict_id")
|
||||
@Schema(description="工程等别 dict_id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long engGrad;
|
||||
|
||||
|
|
@ -292,91 +294,91 @@ public class StResB implements Serializable {
|
|||
* 承雨面积
|
||||
*/
|
||||
@TableField(value = "BEAR_RAIN_AREA")
|
||||
@Schema(description = "承雨面积")
|
||||
@Schema(description="承雨面积")
|
||||
private BigDecimal bearRainArea;
|
||||
|
||||
/**
|
||||
* 正常蓄水位相应水面面积
|
||||
*/
|
||||
@TableField(value = "NORM_POOL_STAG_AREA")
|
||||
@Schema(description = "正常蓄水位相应水面面积")
|
||||
@Schema(description="正常蓄水位相应水面面积")
|
||||
private BigDecimal normPoolStagArea;
|
||||
|
||||
/**
|
||||
* 正常高水位
|
||||
*/
|
||||
@TableField(value = "NORMZ")
|
||||
@Schema(description = "正常高水位")
|
||||
@Schema(description="正常高水位")
|
||||
private BigDecimal normz;
|
||||
|
||||
/**
|
||||
* 设计灌溉面积
|
||||
*/
|
||||
@TableField(value = "DES_IRR_A")
|
||||
@Schema(description = "设计灌溉面积")
|
||||
@Schema(description="设计灌溉面积")
|
||||
private BigDecimal desIrrA;
|
||||
|
||||
/**
|
||||
* 实际灌溉面积
|
||||
*/
|
||||
@TableField(value = "ACT_IRR_A")
|
||||
@Schema(description = "实际灌溉面积")
|
||||
@Schema(description="实际灌溉面积")
|
||||
private BigDecimal actIrrA;
|
||||
|
||||
/**
|
||||
* 受益人口
|
||||
*/
|
||||
@TableField(value = "BEN_PP")
|
||||
@Schema(description = "受益人口")
|
||||
@Schema(description="受益人口")
|
||||
private Integer benPp;
|
||||
|
||||
/**
|
||||
* 引供水能力
|
||||
*/
|
||||
@TableField(value = "CITE_WAT_SUP_PROP")
|
||||
@Schema(description = "引供水能力")
|
||||
@Schema(description="引供水能力")
|
||||
private BigDecimal citeWatSupProp;
|
||||
|
||||
/**
|
||||
* 城镇供水量
|
||||
*/
|
||||
@TableField(value = "CITY_TOWN_SUP_WAT")
|
||||
@Schema(description = "城镇供水量")
|
||||
@Schema(description="城镇供水量")
|
||||
private BigDecimal cityTownSupWat;
|
||||
|
||||
/**
|
||||
* 灌溉水量
|
||||
*/
|
||||
@TableField(value = "IRR_WAT")
|
||||
@Schema(description = "灌溉水量")
|
||||
@Schema(description="灌溉水量")
|
||||
private BigDecimal irrWat;
|
||||
|
||||
/**
|
||||
* 泄洪能力
|
||||
*/
|
||||
@TableField(value = "FLD_CRY_PROP")
|
||||
@Schema(description = "泄洪能力")
|
||||
@Schema(description="泄洪能力")
|
||||
private BigDecimal fldCryProp;
|
||||
|
||||
/**
|
||||
* 多年平均日蓄水量
|
||||
*/
|
||||
@TableField(value = "MYYRVW")
|
||||
@Schema(description = "多年平均日蓄水量")
|
||||
@Schema(description="多年平均日蓄水量")
|
||||
private BigDecimal myyrvw;
|
||||
|
||||
/**
|
||||
* 各月蓄水量
|
||||
*/
|
||||
@TableField(value = "MONVW")
|
||||
@Schema(description = "各月蓄水量")
|
||||
@Schema(description="各月蓄水量")
|
||||
private BigDecimal monvw;
|
||||
|
||||
/**
|
||||
* 水库类型 dict_id
|
||||
*/
|
||||
@TableField(value = "RES_TYPE")
|
||||
@Schema(description = "水库类型 dict_id")
|
||||
@Schema(description="水库类型 dict_id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long resType;
|
||||
|
||||
|
|
@ -384,106 +386,106 @@ public class StResB implements Serializable {
|
|||
* 防洪高水位
|
||||
*/
|
||||
@TableField(value = "UPP_LEV_FLCO")
|
||||
@Schema(description = "防洪高水位")
|
||||
@Schema(description="防洪高水位")
|
||||
private BigDecimal uppLevFlco;
|
||||
|
||||
/**
|
||||
* 正常蓄水位相应库容
|
||||
*/
|
||||
@TableField(value = "NORM_POOL_STAG_CAP")
|
||||
@Schema(description = "正常蓄水位相应库容")
|
||||
@Schema(description="正常蓄水位相应库容")
|
||||
private BigDecimal normPoolStagCap;
|
||||
|
||||
/**
|
||||
* 防洪限制水位库容
|
||||
*/
|
||||
@TableField(value = "FL_LOW_LIM_LEV_CAP")
|
||||
@Schema(description = "防洪限制水位库容")
|
||||
@Schema(description="防洪限制水位库容")
|
||||
private BigDecimal flLowLimLevCap;
|
||||
|
||||
/**
|
||||
* 调洪库容
|
||||
*/
|
||||
@TableField(value = "STOR_FL_CAP")
|
||||
@Schema(description = "调洪库容")
|
||||
@Schema(description="调洪库容")
|
||||
private BigDecimal storFlCap;
|
||||
|
||||
/**
|
||||
* 工程建设情况
|
||||
*/
|
||||
@TableField(value = "ENG_STAT")
|
||||
@Schema(description = "工程建设情况")
|
||||
@Schema(description="工程建设情况")
|
||||
private String engStat;
|
||||
|
||||
/**
|
||||
* 运行状况
|
||||
*/
|
||||
@TableField(value = "RUN_STAT")
|
||||
@Schema(description = "运行状况")
|
||||
@Schema(description="运行状况")
|
||||
private String runStat;
|
||||
|
||||
/**
|
||||
* 管理单位代码
|
||||
*/
|
||||
@TableField(value = "ENG_MAN_CODE")
|
||||
@Schema(description = "管理单位代码")
|
||||
@Schema(description="管理单位代码")
|
||||
private String engManCode;
|
||||
|
||||
/**
|
||||
* 河流代码
|
||||
*/
|
||||
@TableField(value = "RV_CODE")
|
||||
@Schema(description = "河流代码")
|
||||
@Schema(description="河流代码")
|
||||
private String rvCode;
|
||||
|
||||
/**
|
||||
* 状态 1:启用 0:禁用
|
||||
*/
|
||||
@TableField(value = "[STATUS]")
|
||||
@Schema(description = " 状态 1:启用 0:禁用")
|
||||
@Schema(description=" 状态 1:启用 0:禁用")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@TableField(value = "TM")
|
||||
@Schema(description = "修改时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@Schema(description="修改时间")
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date tm;
|
||||
|
||||
/**
|
||||
* 设计洪水标准
|
||||
*/
|
||||
@TableField(value = "DSFLST")
|
||||
@Schema(description = "设计洪水标准")
|
||||
@Schema(description="设计洪水标准")
|
||||
private String dsflst;
|
||||
|
||||
/**
|
||||
* 校核洪水标准
|
||||
*/
|
||||
@TableField(value = "CHFLST")
|
||||
@Schema(description = "校核洪水标准")
|
||||
@Schema(description="校核洪水标准")
|
||||
private String chflst;
|
||||
|
||||
/**
|
||||
* 设计洪水流量
|
||||
*/
|
||||
@TableField(value = "DSFLFL")
|
||||
@Schema(description = "设计洪水流量")
|
||||
@Schema(description="设计洪水流量")
|
||||
private BigDecimal dsflfl;
|
||||
|
||||
/**
|
||||
* 校核洪水流量
|
||||
*/
|
||||
@TableField(value = "CHFLFL")
|
||||
@Schema(description = "校核洪水流量")
|
||||
@Schema(description="校核洪水流量")
|
||||
private BigDecimal chflfl;
|
||||
|
||||
/**
|
||||
* 水准基面
|
||||
*/
|
||||
@TableField(value = "LVBSLV")
|
||||
@Schema(description = "水准基面")
|
||||
@Schema(description="水准基面")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long lvbslv;
|
||||
|
||||
|
|
@ -491,7 +493,7 @@ public class StResB implements Serializable {
|
|||
* 假定水准基面位置
|
||||
*/
|
||||
@TableField(value = "DLBLP")
|
||||
@Schema(description = "假定水准基面位置")
|
||||
@Schema(description="假定水准基面位置")
|
||||
private String dlblp;
|
||||
|
||||
public static final String COL_RES_ID = "RES_ID";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.gunshi.project.xyt.model;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
|
@ -8,24 +7,24 @@ import com.fasterxml.jackson.annotation.JsonFormat;
|
|||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 库(湖)容曲线表
|
||||
*/
|
||||
@Schema(description="库(湖)容曲线表")
|
||||
@Schema(description = "库(湖)容曲线表")
|
||||
@Data
|
||||
@TableName(value = "dbo.ST_ZVARL_B")
|
||||
public class StZvarlB implements Serializable {
|
||||
/**
|
||||
* 水库ID
|
||||
*/
|
||||
@TableField(value = "RES_ID")
|
||||
@Schema(description="水库ID")
|
||||
@TableId(value = "RES_ID")
|
||||
@Schema(description = "水库ID")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long resId;
|
||||
|
||||
|
|
@ -33,51 +32,51 @@ public class StZvarlB implements Serializable {
|
|||
* 点序号
|
||||
*/
|
||||
@TableField(value = "PTNO")
|
||||
@Schema(description="点序号")
|
||||
@Schema(description = "点序号")
|
||||
private Integer ptno;
|
||||
|
||||
/**
|
||||
* 测站编码
|
||||
*/
|
||||
@TableField(value = "STCD")
|
||||
@Schema(description="测站编码")
|
||||
@Schema(description = "测站编码")
|
||||
private String stcd;
|
||||
|
||||
/**
|
||||
* 施测时间
|
||||
*/
|
||||
@TableField(value = "MSTM")
|
||||
@Schema(description="施测时间")
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
@Schema(description = "施测时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date mstm;
|
||||
|
||||
/**
|
||||
* 库水位
|
||||
*/
|
||||
@TableField(value = "RZ")
|
||||
@Schema(description="库水位")
|
||||
@Schema(description = "库水位")
|
||||
private BigDecimal rz;
|
||||
|
||||
/**
|
||||
* 蓄水量
|
||||
*/
|
||||
@TableField(value = "W")
|
||||
@Schema(description="蓄水量")
|
||||
@Schema(description = "蓄水量")
|
||||
private BigDecimal w;
|
||||
|
||||
/**
|
||||
* 水面面积
|
||||
*/
|
||||
@TableField(value = "WSFA")
|
||||
@Schema(description="水面面积")
|
||||
@Schema(description = "水面面积")
|
||||
private Integer wsfa;
|
||||
|
||||
/**
|
||||
* 时间戳
|
||||
*/
|
||||
@TableField(value = "MODITIME")
|
||||
@Schema(description="时间戳")
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
@Schema(description = "时间戳")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date moditime;
|
||||
|
||||
public static final String COL_RES_ID = "RES_ID";
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ public class EngineeringDrainageService {
|
|||
* @param resId 水库ID
|
||||
*/
|
||||
public void deleteStResStcdRef(String resId){
|
||||
if (stResStcdRefAutoDao.getById(resId) != null){
|
||||
if (stResStcdRefAutoDao.getById(resId) == null){
|
||||
throw new IllegalArgumentException("该水库ID不存在测站关系");
|
||||
}
|
||||
stResStcdRefAutoDao.removeById(resId);
|
||||
|
|
@ -233,7 +233,7 @@ public class EngineeringDrainageService {
|
|||
if (byId == null){
|
||||
throw new IllegalArgumentException("该水库ID对应的库容曲线不存在");
|
||||
}
|
||||
stZvarlB.setMstm(new Date());
|
||||
stZvarlB.setModitime(new Date());
|
||||
stZvarlBAutoDao.updateById(stZvarlB);
|
||||
}
|
||||
|
||||
|
|
@ -286,6 +286,7 @@ public class EngineeringDrainageService {
|
|||
if (stResPersonRefAutoDao.getById(id) == null ){
|
||||
throw new IllegalArgumentException("要更新的水库责任人关系不存在");
|
||||
}
|
||||
stResPersonRef.setTm(new Date());
|
||||
stResPersonRefAutoDao.updateById(stResPersonRef);
|
||||
}
|
||||
|
||||
|
|
@ -353,7 +354,7 @@ public class EngineeringDrainageService {
|
|||
* @param stRvDto 河流的基础信息DTO
|
||||
*/
|
||||
public void insertStRv(StRvDto stRvDto) {
|
||||
if (queryByResCode(stRvDto.getRvCode()) != null){
|
||||
if (queryByRvCode(stRvDto.getRvCode()) != null){
|
||||
throw new IllegalArgumentException("河流代码必须唯一");
|
||||
}
|
||||
StRvB stRvB = new StRvB();
|
||||
|
|
@ -370,9 +371,6 @@ public class EngineeringDrainageService {
|
|||
* @param stRvB 河流的基础信息
|
||||
*/
|
||||
public void updateStRv(StRvB stRvB) {
|
||||
if (queryByRvCode(stRvB.getRvCode()) != null){
|
||||
throw new IllegalArgumentException("河流代码必须唯一");
|
||||
}
|
||||
Long rvId = stRvB.getRvId();
|
||||
StRvB byId = stRvBAutoDao.getById(rvId);
|
||||
if (byId == null){
|
||||
|
|
@ -643,7 +641,7 @@ public class EngineeringDrainageService {
|
|||
}
|
||||
|
||||
/**
|
||||
* 根据量水设施ID删除量水堰基础信息
|
||||
* 删除量水堰基础信息
|
||||
* @param wmeqId 量水设施ID
|
||||
*/
|
||||
public void deleteStEqpt(String wmeqId){
|
||||
|
|
|
|||
|
|
@ -19,7 +19,4 @@ public class StResFileRefSo {
|
|||
@NotNull(message = "分页参数不能为空")
|
||||
private PageSo pageSo;
|
||||
|
||||
@Schema(description="序号")
|
||||
private Integer sortOn;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public class StResPageSo {
|
|||
@Schema(description="水库规模 dict_id")
|
||||
private String engScal;
|
||||
|
||||
@Schema(description=" 状态 1:启用 0:禁用,默认1")
|
||||
@Schema(description=" 状态 1:启用 0:禁用")
|
||||
private Integer status;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,4 @@ public class StResPersonRefSo {
|
|||
@NotNull(message = "分页参数不能为空")
|
||||
private PageSo pageSo;
|
||||
|
||||
@Schema(description="序号")
|
||||
private Integer sortOn;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
|
|||
|
||||
@Data
|
||||
@Schema(description = "库容曲线信息查询参数")
|
||||
public class StZvarlSo extends StZvarlB {
|
||||
public class StZvarlSo{
|
||||
|
||||
@NotNull(message = "分页参数不能为空")
|
||||
private PageSo pageSo;
|
||||
|
|
|
|||
Loading…
Reference in New Issue