From f0a64656128160d08aa6c8da6bf576fea6c03f3f Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 24 Jul 2024 20:11:28 +0800
Subject: [PATCH] 报汛增加主站水位、主站超溢洪道
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
index 12c2845..fe40797 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
@@ -4,12 +4,16 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* 报汛记录
@@ -31,6 +35,17 @@
*/
@ApiModelProperty("今日降雨（毫米）")
private String curDrp;
+
+ private String daysw;//当日水位
+
+ private String daykr;//当日库容
+
+ private String rkll;//入库流量
+
+ private String ckllgg;//出库流量-灌溉
+ private String ckllfd;//出库流量-发电
+ private String ckllxth;//出库流量-泄调洪
+ private String ckllqt;//出库流量-其它
/**
* 老站监测水位（米）
@@ -57,15 +72,15 @@
private String wlwOverZ;
/**
- * 人工观测水位超汛幅度
+ * 人工观测水位超溢洪道
*/
- @ApiModelProperty("人工观测水位超汛幅度")
+ @ApiModelProperty("人工观测水位超溢洪道")
private String personOverZ;
/**
- * 新站监测水位（米）
+ * 人工监测水位（米）
*/
- @ApiModelProperty("新站监测水位（米）")
+ @ApiModelProperty("人工监测水位（米）")
private String personRz;
/**
@@ -107,11 +122,31 @@
private String taskId;
/**
- * 行政区划
+ * 行政区划(数据库只存了countyCode,没用)
*/
@ApiModelProperty("行政区划")
private String adCode;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @ApiModelProperty("报汛时间")
+ private Date reportTime;
+ @ApiModelProperty("昨日雨量")
+ private Double yRain;
+ @ApiModelProperty("是否有白蚁活动")
+ private Integer isBaiyiAction;
+
+ @ApiModelProperty("主站水位(米)")
+ private Double mainZ;
+
+ @ApiModelProperty("主站超溢洪道(米)")
+ private Double mainOZ;
+
+
/**
* 是否审核（1、审核通过；2、审核未通过）
*/
--
Gitblit v1.9.3