From b1384c4959a4486d391369c4e7a58c4b4b0e9b9c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 13 十一月 2024 17:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 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 0c9b42b..47280ea 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
@@ -37,7 +37,41 @@
public int currentRamAddr ;// 褰撳墠涓嬪彂鍗囩骇鍖匯TU瀛樺偍鍦板潃
public String lastDownDt ;// 鏈�鍚庝笅鍙戝崌绾ф暟鎹寘鏃堕棿锛坹yyy-mm-dd HH:HH:SS锛�
public int reTryTimes ;//鍗囩骇涓嶆垚鍔燂紝閲嶈瘯娆℃暟
- public boolean isOver ;
+ public boolean isOver ;//鏄惁鍗囩骇杩囩▼缁撴潫锛�1锛氱粨鏉燂紝0锛氭湭缁撴潫
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("RTU锛�" + rtuAddr + "锛夊崌绾х姸鎬侊細") ;
+ sb.append(" \n褰� 鍓� 鐘� 鎬侊細" + getStateName(state)) ;
+ sb.append(" \n闇�涓嬪彂鏁版嵁鍖呮�绘暟锛�" + totalPackage) ;
+ sb.append(" \n褰撳墠涓嬪彂鍗囩骇鍖呮暟锛�" + currentPackage) ;
+ sb.append(" \n褰撳墠涓嬪彂瀛樺偍鍦板潃锛�" + currentRamAddr) ;
+ sb.append(" \n褰撳墠涓嬪彂鏁版嵁鏃堕棿锛�" + lastDownDt) ;
+ sb.append(" \n鍗囩骇澶辫触閲嶈瘯娆℃暟锛�" + reTryTimes) ;
+ sb.append(" \n鍗囩骇杩囩▼鏄惁缁撴潫锛�" + (isOver?"鏄�":"鍚�")) ;
+ return sb.toString() ;
+ }
+
+ public static String getStateName(int state){
+ switch (state) {
+ case STATE_OFFLINE:
+ return "绂荤嚎";
+ case STATE_UNSTART:
+ return "鏈紑濮�";
+ case STATE_RUNNING:
+ return "鍗囩骇涓�";
+ case STATE_SUCCESS:
+ return "鍗囩骇鎴愬姛";
+ case STATE_FAILONE:
+ return "鍗囩骇澶辫触锛�1鍖呮锛�";
+ case STATE_FAIL:
+ return "鍗囩骇澶辫触锛堥潪1鍖呮锛�";
+ case STATE_FAILOFFLINE:
+ return "鍗囩骇澶辫触锛堢绾匡級";
+ default:
+ return "鏈煡";
+ }
+ }
/**
* 瑙﹀彂鍗囩骇
--
Gitblit v1.8.0