From 6a58ea0db0bc74f70933ca266d375afd0c287aae Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 24 Nov 2023 17:57:05 +0800
Subject: [PATCH] 蓄水量日报
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/SkxsQkTj.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/entity/SkxsQkTj.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/SkxsQkTj.java
similarity index 79%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/entity/SkxsQkTj.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/SkxsQkTj.java
index 0f0f865..e5919f9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/entity/SkxsQkTj.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/SkxsQkTj.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
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.NullSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -50,6 +52,7 @@
*/
@ApiModelProperty(value = "总库容")
@TableField("\"total_cap\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double totalCap;
/**
@@ -57,6 +60,7 @@
*/
@ApiModelProperty(value = "当前水位")
@TableField("\"rz\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double rz;
/**
@@ -64,6 +68,7 @@
*/
@ApiModelProperty(value = "当日蓄水量")
@TableField("\"ws\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double ws;
/**
@@ -71,6 +76,7 @@
*/
@ApiModelProperty(value = "上月最后一天蓄水量")
@TableField("\"up_month_ws\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double upMonthWs;
/**
@@ -78,6 +84,7 @@
*/
@ApiModelProperty(value = "去年同期蓄水量")
@TableField("\"last_year_ws\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double lastYearWs;
/**
@@ -85,6 +92,7 @@
*/
@ApiModelProperty(value = "历史同期蓄水量")
@TableField("\"his_ws\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double hisWs;
/**
@@ -92,6 +100,7 @@
*/
@ApiModelProperty(value = "今年以来灌溉放水量")
@TableField("\"now_year_irr_dw\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double nowYearIrrDw;
/**
@@ -99,6 +108,7 @@
*/
@ApiModelProperty(value = "今年以来生活放水量")
@TableField("\"now_year_live_dw\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double nowYearLiveDw;
/**
@@ -106,6 +116,7 @@
*/
@ApiModelProperty(value = "今年以来生态放水量 ")
@TableField("\"now_year_zoo_dw\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double nowYearZooDw;
/**
@@ -113,20 +124,23 @@
*/
@ApiModelProperty(value = "总蓄水现有-历史 ")
@TableField("\"total_ws_dif\"")
- private String totalWsDif;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double totalWsDif;
/**
* 总蓄水较历史同期（%）
*/
@ApiModelProperty(value = "总蓄水较历史同期（%）")
@TableField("\"total_ws_his_pro\"")
- private String totalWsHisPro;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double totalWsHisPro;
/**
* 死库容
*/
@ApiModelProperty(value = "死库容")
@TableField("\"dead_cap\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double deadCap;
/**
@@ -134,6 +148,7 @@
*/
@ApiModelProperty(value = "当前有效蓄水 ")
@TableField("\"now_valid_ws\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double nowValidWs;
/**
@@ -141,6 +156,7 @@
*/
@ApiModelProperty(value = "兴利库容 ")
@TableField("\"ben_res_cap\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double benResCap;
/**
@@ -148,25 +164,29 @@
*/
@ApiModelProperty(value = "有效蓄水/兴利（%） ")
@TableField("\"valid_ws_ben_pro\"")
- private String validWsBenPro;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double validWsBenPro;
/**
* 历史同期有效蓄水
*/
@ApiModelProperty(value = "历史同期有效蓄水 ")
@TableField("\"his_valid_ws\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double hisValidWs;
/**
* 当前有效比历史同期（%）
*/
@ApiModelProperty(value = "当前有效比历史同期（%） ")
@TableField("\"now_valid_his_pro\"")
- private String nowValidHisPro;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double nowValidHisPro;
/**
* 去年有效蓄水
*/
@ApiModelProperty(value = "去年有效蓄水 ")
@TableField("\"last_year_valid_ws\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double lastYearValidWs;
/**
@@ -174,7 +194,8 @@
*/
@ApiModelProperty(value = "当前有效比去年同期（%） ")
@TableField("\"now_valid_last_pro\"")
- private String nowValidLastPro;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double nowValidLastPro;
/**
* 统计时间
--
Gitblit v1.9.3