From 5e12f38583c4a98005618edaa1e1a15507a478a8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 04 一月 2025 08:33:02 +0800
Subject: [PATCH] web文件系统显示文件的URL中的nginx的端口改为花生壳的配置端口19913
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 2d81abd..41b06f6 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
@@ -14,6 +14,8 @@
public class UpgradeRtu {
@JSONField(serialize = false)
+ public static final int STATE_OPEN = -2 ;//-1-闃�寮�锛堟车寮�锛変笉鑳藉崌绾�
+ @JSONField(serialize = false)
public static final int STATE_OFFLINE = -1 ;//-1-绂荤嚎
@JSONField(serialize = false)
public static final int STATE_UNSTART = 0 ;//0-鏈紑濮�
@@ -28,14 +30,17 @@
@JSONField(serialize = false)
public static final int STATE_FAILOFFLINE = 5 ;//4-鍗囩骇澶辫触锛堢绾匡級
@JSONField(serialize = false)
- public static final int RAMADDRADD = 0x20 ;//绋嬪簭瀛樺偍鍐呭瓨鍦ㄥ潃澧為噺
+ public static final int STATE_FAILOPEN = 6 ;//4-鍗囩骇澶辫触锛堥榾寮�锛�
+ @JSONField(serialize = false)
+ public static final int RAMADDRADD = 0x200 ;//绋嬪簭瀛樺偍鍐呭瓨鍦ㄥ潃澧為噺
public String rtuAddr ;
- public int state ;// -1-绂荤嚎锛�0-鏈紑濮嬶紝1-鍗囩骇涓紝2-鍗囩骇鎴愬姛锛�3-鍗囩骇澶辫触锛�1鍖呮锛夛紝4-鍗囩骇澶辫触锛堥潪1鍖呮锛夛紝5-鍗囩骇澶辫触锛堢绾匡級
+ public int state ;// -1-绂荤嚎锛�0-鏈紑濮嬶紝1-鍗囩骇涓紝2-鍗囩骇鎴愬姛锛�3-鍗囩骇澶辫触锛�1鍖呮锛夛紝4-鍗囩骇澶辫触锛堥潪1鍖呮锛夛紝5-鍗囩骇澶辫触锛堢绾匡級锛�6-鍗囩骇澶辫触锛堥榾寮�锛�
public int totalPackage ;// 鎬诲寘鏁�
public int currentPackage ;// 褰撳墠涓嬪彂鍗囩骇鍖呮暟
public int currentRamAddr ;// 褰撳墠涓嬪彂鍗囩骇鍖匯TU瀛樺偍鍦板潃
public String lastDownDt ;// 鏈�鍚庝笅鍙戝崌绾ф暟鎹寘鏃堕棿锛坹yyy-mm-dd HH:HH:SS锛�
+ public Long lastDownDtAt ;// 鏈�鍚庝笅鍙戝崌绾ф暟鎹寘鏃跺埢
public int reTryTimes ;//鍗囩骇涓嶆垚鍔燂紝閲嶈瘯娆℃暟
public boolean isOver ;//鏄惁鍗囩骇杩囩▼缁撴潫锛�1锛氱粨鏉燂紝0锛氭湭缁撴潫
@@ -54,6 +59,8 @@
public static String getStateName(int state){
switch (state) {
+ case STATE_OPEN:
+ return "闃�寮�";
case STATE_OFFLINE:
return "绂荤嚎";
case STATE_UNSTART:
@@ -65,9 +72,11 @@
case STATE_FAILONE:
return "涓�鍖呮";
case STATE_FAIL:
- return "鍗囩骇涓";
+ return "澶氬寘姝�";
case STATE_FAILOFFLINE:
return "绂荤嚎澶辫触";
+ case STATE_FAILOPEN:
+ return "闃�寮�澶辫触";
default:
return "鏈煡";
}
--
Gitblit v1.8.0