From 6dacac48ebb596797dfd8e5bf3a803ed0b583643 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 17:11:31 +0800
Subject: [PATCH] 取水口综合信息-统计数据逻辑处理模块完善
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
index 88d93e0..6a4ab79 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
@@ -1,7 +1,13 @@
package com.dy.pipIrrGlobal.voPr;
+import com.alibaba.fastjson2.annotation.JSONField;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
+
+import java.io.Serial;
+import java.util.Date;
/**
* @author ZhuBaoMin
@@ -11,6 +17,7 @@
*/
@Data
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine"})
public class VoOnLineIntake implements BaseEntity {
private static final long serialVersionUID = 202405271703001L;
@@ -40,6 +47,12 @@
private Double lat;
/**
+ * 绱娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double totalAmount;
+
+ /**
* 鏄惁鍦ㄧ嚎
*/
private Boolean isOnLine;
@@ -51,7 +64,13 @@
/**
- * 鎶ヨ淇℃伅Json鏁扮粍
+ * 鎶ヨ淇℃伅Json鏁扮粍鍜屾帴鏀跺埌鎶ヨ鏃堕棿
*/
private String alarm;
+
+ /**
+ * 鎺ユ敹鍒版姤璀︽椂闂�
+ */
+ @JSONField(serialize = false)
+ private Date alarmDt;
}
--
Gitblit v1.8.0