From d8eb22351c6d0bfe0c9f233edfd593538e6838c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 四月 2025 13:58:49 +0800
Subject: [PATCH] 1、表阀一体机协议开阀类型变化; 2、表阀一体机协议开关阀报中增加水价数据;

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
index 8057a8d..ed2fd95 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
@@ -15,7 +15,7 @@
  */
 
 @Data
-@JsonPropertyOrder({"planName", "projectName", "planStartTime", "planStopTime", "groups"})
+@JsonPropertyOrder({"planName", "projectName", "state", "planStartTime", "planStopTime", "realStopTime", "failureCount", "groups"})
 public class VoPlanDetails {
     private static final long serialVersionUID = 202504091125001L;
 
@@ -30,6 +30,11 @@
     private String projectName;
 
     /**
+     * 鐏屾簤璁″垝鐘舵��
+     */
+    private Integer state;
+
+    /**
      * 鐏屾簤璁″垝寮�濮嬫椂闂�
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
@@ -42,7 +47,19 @@
     private Date planStopTime;
 
     /**
+     * 瀹為檯缁撴潫鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date realStopTime;
+
+    /**
+     * 鍛戒护鍙戝竷澶辫触鏁伴噺
+     */
+    private Integer failureCount;
+
+    /**
      * 杞亴缁勫垪琛�
      */
     private List<VoGroupResult> groups;
+
 }

--
Gitblit v1.8.0