From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] （1）升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败； （2）升级状态向Remote模块通知时，当升级任务结束后，仍要向remote模块通知可配置的次数；
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 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 0c9b42b..ef50911 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
@@ -22,13 +22,13 @@
@JSONField(serialize = false)
public static final int STATE_SUCCESS = 2 ;//2-鍗囩骇鎴愬姛
@JSONField(serialize = false)
- public static final int STATE_FAILONE = 3 ;//3-鍗囩骇澶辫触锛�1鍖呮锛�
+ public static final int STATE_FAILONE = 3 ;//3-鍗囩骇澶辫触锛堜竴鍖呮锛�
@JSONField(serialize = false)
- public static final int STATE_FAIL = 4 ;//4-鍗囩骇澶辫触锛堥潪1鍖呮锛�
+ public static final int STATE_FAIL = 4 ;//4-鍗囩骇澶辫触锛堝鍖呮锛�
@JSONField(serialize = false)
public static final int STATE_FAILOFFLINE = 5 ;//4-鍗囩骇澶辫触锛堢绾匡級
@JSONField(serialize = false)
- public static final int RAMADDRADD = 0x20 ;//绋嬪簭瀛樺偍鍐呭瓨鍦ㄥ潃澧為噺
+ public static final int RAMADDRADD = 0x200 ;//绋嬪簭瀛樺偍鍐呭瓨鍦ㄥ潃澧為噺
public String rtuAddr ;
public int state ;// -1-绂荤嚎锛�0-鏈紑濮嬶紝1-鍗囩骇涓紝2-鍗囩骇鎴愬姛锛�3-鍗囩骇澶辫触锛�1鍖呮锛夛紝4-鍗囩骇澶辫触锛堥潪1鍖呮锛夛紝5-鍗囩骇澶辫触锛堢绾匡級
@@ -36,8 +36,43 @@
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 ;
+ 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 "涓�鍖呮";
+ case STATE_FAIL:
+ return "澶氬寘姝�";
+ case STATE_FAILOFFLINE:
+ return "绂荤嚎澶辫触";
+ default:
+ return "鏈煡";
+ }
+ }
/**
* 瑙﹀彂鍗囩骇
--
Gitblit v1.8.0