From 6849ec1281a1a45639d6d28eef771eac63e389d2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 六月 2025 16:32:44 +0800
Subject: [PATCH] 1、表阀一体协议，关阀失败数据解析修改； 2、RTU状态处理逻辑修改，每条81上报数据都要保存。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 47 +++++++++++++++++++++--------------------------
1 files changed, 21 insertions(+), 26 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..0424c43 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瀛樺偍鍦板潃
@@ -58,28 +60,19 @@
}
public static String getStateName(int state){
- switch (state) {
- case STATE_OPEN:
- return "闃�寮�";
- case STATE_OFFLINE:
- return "绂荤嚎";
- case STATE_UNSTART:
- return "鏈紑濮�";
- case STATE_RUNNING:
- return "鍗囩骇涓�";
- case STATE_SUCCESS:
- return "鍗囩骇鎴愬姛";
- case STATE_FAILONE:
- return "涓�鍖呮";
- case STATE_FAIL:
- return "澶氬寘姝�";
- case STATE_FAILOFFLINE:
- return "绂荤嚎澶辫触";
- case STATE_FAILOPEN:
- return "闃�寮�澶辫触";
- default:
- return "鏈煡";
- }
+ return switch (state) {
+ case STATE_OPEN -> "闃�寮�";
+ case STATE_OFFLINE -> "绂荤嚎";
+ case STATE_UNSTART -> "鏈紑濮�";
+ case STATE_RUNNING -> "鍗囩骇涓�";
+ case STATE_SUCCESS -> "鍗囩骇鎴愬姛";
+ case STATE_FAILONE -> "涓�鍖呮";
+ case STATE_FAIL -> "澶氬寘姝�";
+ case STATE_FAILOFFLINE -> "绂荤嚎澶辫触";
+ case STATE_FAILOPEN -> "闃�寮�澶辫触";
+ case STATE_FAILRTU -> "RTU澶辫触";
+ default -> "鏈煡";
+ };
}
/**
@@ -87,12 +80,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