From c6beb89b7170115eada78526f87406381c931229 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 03 四月 2025 10:37:51 +0800
Subject: [PATCH] 灌溉计划发布时仅发布灌溉时长大于0的
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
index 41b06f6..7c13c3a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
@@ -28,14 +28,16 @@
@JSONField(serialize = false)
public static final int STATE_FAIL = 4 ;//4-鍗囩骇澶辫触锛堝鍖呮锛�
@JSONField(serialize = false)
- public static final int STATE_FAILOFFLINE = 5 ;//4-鍗囩骇澶辫触锛堢绾匡級
+ public static final int STATE_FAILOFFLINE = 5 ;//5-鍗囩骇澶辫触锛堢绾匡級
@JSONField(serialize = false)
- public static final int STATE_FAILOPEN = 6 ;//4-鍗囩骇澶辫触锛堥榾寮�锛�
+ public static final int STATE_FAILOPEN = 6 ;//6-鍗囩骇澶辫触锛堥榾寮�锛�
+ @JSONField(serialize = false)
+ public static final int STATE_FAILRTU = 7 ;//7-鍗囩骇澶辫触锛圧TU鑷繁澶辫触锛�
@JSONField(serialize = false)
public static final int RAMADDRADD = 0x200 ;//绋嬪簭瀛樺偍鍐呭瓨鍦ㄥ潃澧為噺
public String rtuAddr ;
- public int state ;// -1-绂荤嚎锛�0-鏈紑濮嬶紝1-鍗囩骇涓紝2-鍗囩骇鎴愬姛锛�3-鍗囩骇澶辫触锛�1鍖呮锛夛紝4-鍗囩骇澶辫触锛堥潪1鍖呮锛夛紝5-鍗囩骇澶辫触锛堢绾匡級锛�6-鍗囩骇澶辫触锛堥榾寮�锛�
+ public int state ;// -1-绂荤嚎锛�0-鏈紑濮嬶紝1-鍗囩骇涓紝2-鍗囩骇鎴愬姛锛�3-鍗囩骇澶辫触锛�1鍖呮锛夛紝4-鍗囩骇澶辫触锛堥潪1鍖呮锛夛紝5-鍗囩骇澶辫触锛堢绾匡級锛�6-鍗囩骇澶辫触锛堥榾寮�锛夛紝7-鍗囩骇澶辫触锛圧TU锛�
public int totalPackage ;// 鎬诲寘鏁�
public int currentPackage ;// 褰撳墠涓嬪彂鍗囩骇鍖呮暟
public int currentRamAddr ;// 褰撳墠涓嬪彂鍗囩骇鍖匯TU瀛樺偍鍦板潃
@@ -77,6 +79,8 @@
return "绂荤嚎澶辫触";
case STATE_FAILOPEN:
return "闃�寮�澶辫触";
+ case STATE_FAILRTU:
+ return "RTU澶辫触";
default:
return "鏈煡";
}
@@ -87,12 +91,14 @@
* @param code
* @param softData
* @param callbackCom
+ * @param objects
*/
public void trigger(String code,
String protocolName,
Short protocolVersion,
byte[][] softData,
- Callback callbackCom){
+ Callback callbackCom,
+ Object ...objects){
return ;
}
--
Gitblit v1.8.0