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/XsfsQktj.java | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/entity/XsfsQktj.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/XsfsQktj.java
similarity index 78%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/entity/XsfsQktj.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/XsfsQktj.java
index 504c9d8..1ddd829 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/entity/XsfsQktj.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/XsfsQktj.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;
@@ -57,6 +59,7 @@
*/
@ApiModelProperty(value = "总蓄水合计")
@TableField("\"zxs_total\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double zxsTotal;
/**
@@ -64,41 +67,47 @@
*/
@ApiModelProperty(value = "总蓄水较上次")
@TableField("\"zxs_sc\"")
- private String zxsSc;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double zxsSc;
/**
* 总蓄水较历史同期
*/
@ApiModelProperty(value = "总蓄水较历史同期")
@TableField("\"zxs_his_tq\"")
- private String zxsHisTq;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double zxsHisTq;
/**
* 总蓄水较历史同期增减(%)
*/
@ApiModelProperty(value = "总蓄水较历史同期增减(%)")
@TableField("\"zxs_his_tqzj\"")
- private String zxsHisTqzj;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double zxsHisTqzj;
/**
* 总蓄水较去年同期
*/
@ApiModelProperty(value = "总蓄水较去年同期")
@TableField("\"zxs_last_year_tq\"")
- private String zxsLastYearTq;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double zxsLastYearTq;
/**
* 总蓄水较去年同期增减(%)
*/
@ApiModelProperty(value = "总蓄水较去年同期增减(%)")
@TableField("\"zxs_last_year_tqzj\"")
- private String zxsLastYearTqzj;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double zxsLastYearTqzj;
/**
* 有效蓄水合计
*/
@ApiModelProperty(value = "有效蓄水合计")
@TableField("\"yxxs_total\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double yxxsTotal;
/**
@@ -106,27 +115,31 @@
*/
@ApiModelProperty(value = "有效蓄水较同期历史有效蓄水增减（%） ")
@TableField("\"yxxs_his_tqzj\"")
- private String yxxsHisTqzj;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double yxxsHisTqzj;
/**
* 有效蓄水较同期去年有效蓄水增减（%）
*/
@ApiModelProperty(value = "有效蓄水较同期去年有效蓄水增减（%） ")
@TableField("\"yxxs_last_year_tqzj\"")
- private String yxxsLastYearTqzj;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double yxxsLastYearTqzj;
/**
* 占兴利库容百分比（%）
*/
@ApiModelProperty(value = "占兴利库容百分比（%）")
@TableField("\"yxxs_z_xlkr\"")
- private String yxxsZXlkr;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double yxxsZXlkr;
/**
* 大型水库蓄水合计
*/
@ApiModelProperty(value = "大型水库蓄水合计")
@TableField("\"dxsk_xs_total\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double dxskXsTotal;
/**
@@ -134,44 +147,51 @@
*/
@ApiModelProperty(value = "大型水库蓄水较历史同期 ")
@TableField("\"dxsk_xs_his\"")
- private String dxskXsHis;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double dxskXsHis;
/**
* 大型水库蓄水较去年同期
*/
@ApiModelProperty(value = "大型水库蓄水较去年同期 ")
@TableField("\"dxsk_xs_last_year\"")
- private String dxskXsLastYear;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double dxskXsLastYear;
/**
* 大型水库有效蓄水
*/
@ApiModelProperty(value = "大型水库有效蓄水 ")
@TableField("\"dxsk_yxxs\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double dxskYxxs;
/**
* 中型水库蓄水合计
*/
@ApiModelProperty(value = "中型水库蓄水合计 ")
@TableField("\"zxsk_xs_total\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double zxskXsTotal;
/**
* 中型水库较历史同期
*/
@ApiModelProperty(value = "中型水库较历史同期 ")
@TableField("\"zxsk_xs_his\"")
- private String zxskXsHis;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double zxskXsHis;
/**
* 中型水库较去年同期
*/
@ApiModelProperty(value = "中型水库较去年同期 ")
@TableField("\"zxsk_xs_last_year\"")
- private String zxskXsLastYear;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private Double zxskXsLastYear;
/**
* 中型水库有效蓄水
*/
@ApiModelProperty(value = "中型水库有效蓄水 ")
@TableField("\"zxsk_yxxs\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double zxskYxxs;
/**
@@ -179,6 +199,7 @@
*/
@ApiModelProperty(value = "小型水库蓄水合计 ")
@TableField("\"xxsk_xs_total\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double xxskXsTotal;
/**
@@ -186,6 +207,7 @@
*/
@ApiModelProperty(value = "小型水库有效蓄水 ")
@TableField("\"xxsk_yxxs\"")
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private Double xxskYxxs;
/**
--
Gitblit v1.9.3