From 664eb6bc8536b7498a6eb92b84d900e2cbbc4fb5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 28 十一月 2024 09:04:40 +0800
Subject: [PATCH] 修改一包死多包死与升级失败统计的逻辑bug
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java | 12 ++++++------
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java | 4 ++--
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java | 12 ++++++++----
3 files changed, 16 insertions(+), 12 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 a9e20a5..9c98e77 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
@@ -17,8 +17,8 @@
public int overTotal ;//鎵�鏈夌粨鏉燂紙鍖呮嫭鎴愬姛涓庢墍鏈夊け璐ワ級
public int successTotal ;//鎵�鏈夋垚鍔�
public int failTotal ;//鎵�鏈夊け璐ワ紙涓�鍖呮澶辫触+澶氬寘姝诲け璐�+绂荤嚎澶辫触锛�
- public int failOneTotal ;//鎵�鏈変竴鍖呮澶辫触
- public int failMultiTotal ;//鎵�鏈夊鍖呮澶辫触
+ public int dieOneTotal;//鎵�鏈変竴鍖呮
+ public int dieMultiTotal;//鎵�鏈夊鍖呮
public int failOffTotal ;//鎵�鏈夌绾垮け璐�
public Boolean allOver ;//鎵�鏈夐兘缁撴潫锛坱rue:鏄紝false:鍚︼級
@@ -35,8 +35,8 @@
this.overTotal = 0;
this.successTotal = 0;
this.failTotal = 0;
- this.failOneTotal = 0;
- this.failMultiTotal = 0;
+ this.dieOneTotal = 0;
+ this.dieMultiTotal = 0;
this.failOffTotal = 0;
this.allOver = false ;
}
@@ -51,8 +51,8 @@
sb.append(" \n宸茬粨鏉熸�绘暟锛�" + overTotal) ;
sb.append(" \n鎴愬姛鎬绘暟锛�" + successTotal) ;
sb.append(" \n澶辫触鎬绘暟锛�" + failTotal) ;
- sb.append(" \n涓�鍖呮澶辫触鎬绘暟锛�" + failOneTotal) ;
- sb.append(" \n澶氬寘姝诲け璐ユ�绘暟锛�" + failMultiTotal) ;
+ sb.append(" \n涓�鍖呮澶辫触鎬绘暟锛�" + dieOneTotal) ;
+ sb.append(" \n澶氬寘姝诲け璐ユ�绘暟锛�" + dieMultiTotal) ;
sb.append(" \n绂荤嚎澶辫触鎬绘暟锛�" + failOffTotal) ;
sb.append(" \n鍏ㄧ粨鏉燂細" + allOver) ;
return sb.toString() ;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
index b19ea75..4378bb4 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
@@ -210,11 +210,15 @@
}else if(info.state == UpgradeRtu.STATE_SUCCESS) {
state.successTotal++;
}else if(info.state == UpgradeRtu.STATE_FAILONE) {
- state.failOneTotal++;
- state.failTotal++;
+ state.dieOneTotal++;
+ if(info.isOver){
+ state.failTotal++;
+ }
}else if(info.state == UpgradeRtu.STATE_FAIL) {
- state.failMultiTotal++;
- state.failTotal++;
+ state.dieMultiTotal++;
+ if(info.isOver) {
+ state.failTotal++;
+ }
}else if(info.state == UpgradeRtu.STATE_FAILOFFLINE) {
state.failTotal++;
state.failOffTotal++;
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 abfdc1b..155dfd0 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
@@ -305,10 +305,10 @@
}else if(rtu.state == UpgradeRtu.STATE_SUCCESS) {
cache.ugOverallState.successTotal++;
}else if(rtu.state == UpgradeRtu.STATE_FAILONE) {
- cache.ugOverallState.failOneTotal++;
+ cache.ugOverallState.dieOneTotal++;
cache.ugOverallState.failTotal++;
}else if(rtu.state == UpgradeRtu.STATE_FAIL) {
- cache.ugOverallState.failMultiTotal++;
+ cache.ugOverallState.dieMultiTotal++;
cache.ugOverallState.failTotal++;
}
if(rtu.isOver){
--
Gitblit v1.8.0