From 7c94f000ca94776eb62e8296bf4f42473085f242 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 23 十一月 2024 13:59:22 +0800
Subject: [PATCH] 改一下
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
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 9c606ec..f58698e 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
@@ -13,6 +13,7 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* @Author: liurunyu
@@ -202,19 +203,21 @@
if(this.taskVo.rtuAddrList != null && this.taskVo.rtuAddrList.size() > 0){
state.rtuTotal = this.taskVo.rtuAddrList.size() ;
if(this.upgradeRtus != null && this.upgradeRtus.size() > 0){
- this.upgradeRtus.values().stream().forEach(info ->{
+ AtomicBoolean hasRunning = new AtomicBoolean(false);
+ this.upgradeRtus.values().forEach(info ->{
if(info.state == UpgradeRtu.STATE_OFFLINE){
- state.offLineTotal ++ ;
+ state.failTotal++;
}else if(info.state == UpgradeRtu.STATE_UNSTART){
state.unStartTotal ++ ;
}else if(info.state == UpgradeRtu.STATE_RUNNING){
state.runningTotal ++ ;
}else if(info.state == UpgradeRtu.STATE_SUCCESS) {
state.successTotal++;
- }else if(info.state == UpgradeRtu.STATE_FAIL) {
- state.failTotal++;
}else if(info.state == UpgradeRtu.STATE_FAILONE) {
state.failOneTotal++;
+ state.failTotal++;
+ }else if(info.state == UpgradeRtu.STATE_FAIL) {
+ state.failMultiTotal++;
state.failTotal++;
}else if(info.state == UpgradeRtu.STATE_FAILOFFLINE) {
state.failTotal++;
@@ -222,8 +225,15 @@
}
if(info.isOver){
state.overTotal++;
+ }else{
+ hasRunning.set(true);
}
});
+ if(!hasRunning.get()){
+ state.allOver = true ;
+ }else{
+ state.allOver = false ;
+ }
}
}
return state ;
--
Gitblit v1.8.0