From 0c1e685e4ac58072f72dcd990ba811fe23bb0065 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十一月 2024 17:07:49 +0800
Subject: [PATCH] 升级监视，修改重置逻辑错误
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java | 4 ++++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java | 22 +++++++++++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
index 145bd62..2c2b836 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
@@ -19,6 +19,8 @@
public int failTotal ;//鎵�鏈夊け璐�
public int failOneTotal ;//鎵�鏈変竴鍖呮澶辫触
+ public Boolean allOver ;//鎵�鏈夐兘缁撴潫锛坱rue:鏄紝false:鍚︼級
+
public UpgradeState() {
this.init();
}
@@ -31,6 +33,7 @@
this.overTotal = 0;
this.successTotal = 0;
this.failTotal = 0;
+ this.allOver = false ;
}
public String toString(){
@@ -44,6 +47,7 @@
sb.append(" \n鎴愬姛鎬绘暟锛�" + successTotal) ;
sb.append(" \n澶辫触鎬绘暟锛�" + failTotal) ;
sb.append(" \n1鍖呮鎬绘暟锛�" + failOneTotal) ;
+ sb.append(" \n鍏ㄧ粨鏉燂細" + allOver) ;
return sb.toString() ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
index fab9b73..f561100 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
@@ -246,11 +246,7 @@
|| n == 42
|| n == 43
|| n == 44
- || n == 45
- || n == 46
- || n == 47
- || n == 48
- || n == 49){
+ || n == 45){
if(rtu.currentPackage != 1){
//鍗囨
rtu.state = UpgradeRtu.STATE_FAIL ;
@@ -265,12 +261,16 @@
return ;
}
- rtu.state = UpgradeRtu.STATE_RUNNING ;
- rtu.currentPackage += 1 ;
- rtu.currentRamAddr = 0x00 + UpgradeRtu.RAMADDRADD ;
- rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
- rtu.reTryTimes = 0 ;
- rtu.isOver = false ;
+ if(rtu.state != UpgradeRtu.STATE_FAILONE &&
+ rtu.state != UpgradeRtu.STATE_FAIL){
+ rtu.state = UpgradeRtu.STATE_RUNNING ;
+ rtu.currentPackage += 1 ;
+ rtu.currentRamAddr = 0x00 + UpgradeRtu.RAMADDRADD ;
+ rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ rtu.reTryTimes = 0 ;
+ rtu.isOver = false ;
+ }
+
}
/**
--
Gitblit v1.8.0