From 83742e476be26188965380c0c7cebf03f867e204 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 09 十二月 2024 09:02:03 +0800
Subject: [PATCH] 远程监控功能中,显示设备报警信息同时也显示报警接收时间,修改相应的代码与SQL

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
index c556bf8..beca40c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author ZhuBaoMin
  * @date 2024-05-24 16:30
@@ -12,7 +14,7 @@
  */
 
 @Data
-@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned"})
+@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned", "dt", "waterInstant"})
 public class VoUnclosedValve implements BaseEntity {
     private static final long serialVersionUID = 202405241634001L;
 
@@ -53,5 +55,13 @@
      */
     private Boolean planned;
 
-    //private Date openTime;
+    /**
+     * 宸ヤ綔鎶ユ椂闂�
+     */
+    private Date dt;
+
+    /**
+     * 鐬椂娴侀噺
+     */
+    private Double waterInstant;
 }

--
Gitblit v1.8.0