From e4d9487314cb32ed27bdcb027bbf43b4e1e3160f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 06 十二月 2024 13:40:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeResSv.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeResSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeResSv.java
index 03c204d..59eb4c2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeResSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeResSv.java
@@ -2,7 +2,8 @@
import com.dy.common.softUpgrade.state.UpgradeRtu;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.voUg.VoUgRtuResult;
+import com.dy.pipIrrGlobal.voUg.VoUgRtuResult4Failure;
+import com.dy.pipIrrGlobal.voUg.VoUgRtuResult4Success;
import com.dy.pipIrrGlobal.voUg.VoWatch;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -87,7 +88,8 @@
ok = rtu.state == UpgradeRtu.STATE_OFFLINE
|| rtu.state == UpgradeRtu.STATE_FAILONE
|| rtu.state == UpgradeRtu.STATE_FAIL
- || rtu.state == UpgradeRtu.STATE_FAILOFFLINE;
+ || rtu.state == UpgradeRtu.STATE_FAILOFFLINE
+ || rtu.state == UpgradeRtu.STATE_FAILOPEN;
}
}
if(qvoRtuAddr != null && !qvoRtuAddr.trim().equals("")){
@@ -104,8 +106,8 @@
* 杩囨护鍑哄綋鍓嶉暱绾т换鍔′腑鍗囩骇澶辫触鐨凴TU
* @return 闆嗗悎
*/
- public List<VoUgRtuResult> exportUgFail(){
- List<VoUgRtuResult> list = new ArrayList<>() ;
+ public List<VoUgRtuResult4Failure> exportUgFail(){
+ List<VoUgRtuResult4Failure> list = new ArrayList<>() ;
if(RtuUpgradeStateReceiverCtrl.cache != null && RtuUpgradeStateReceiverCtrl.cache.ugTaskId != null){
if(RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList != null && RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size() > 0) {
RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.forEach(rtu -> {
@@ -113,17 +115,22 @@
if(rtu.state == UpgradeRtu.STATE_OFFLINE
|| rtu.state == UpgradeRtu.STATE_UNSTART
|| rtu.state == UpgradeRtu.STATE_FAILOFFLINE){
- VoUgRtuResult vo = new VoUgRtuResult() ;
+ VoUgRtuResult4Failure vo = new VoUgRtuResult4Failure() ;
vo.rtuAddr = rtu.rtuAddr ;
vo.result = "绂荤嚎" ;
list.add(vo);
+ }else if(rtu.state == UpgradeRtu.STATE_FAILOPEN){
+ VoUgRtuResult4Failure vo = new VoUgRtuResult4Failure() ;
+ vo.rtuAddr = rtu.rtuAddr ;
+ vo.result = "闃�寮�" ;
+ list.add(vo);
}else if(rtu.state == UpgradeRtu.STATE_FAILONE){
- VoUgRtuResult vo = new VoUgRtuResult() ;
+ VoUgRtuResult4Failure vo = new VoUgRtuResult4Failure() ;
vo.rtuAddr = rtu.rtuAddr ;
vo.result = "涓�鍖呮" ;
list.add(vo);
}else if(rtu.state == UpgradeRtu.STATE_FAIL){
- VoUgRtuResult vo = new VoUgRtuResult() ;
+ VoUgRtuResult4Failure vo = new VoUgRtuResult4Failure() ;
vo.rtuAddr = rtu.rtuAddr ;
vo.result = "澶氬寘姝�" ;
list.add(vo);
@@ -139,14 +146,14 @@
* 杩囨护鍑哄綋鍓嶉暱绾т换鍔′腑鍗囩骇鎴愬姛鐨凴TU
* @return 闆嗗悎
*/
- public List<VoUgRtuResult> exportUgSuccess(){
- List<VoUgRtuResult> list = new ArrayList<>() ;
+ public List<VoUgRtuResult4Success> exportUgSuccess(){
+ List<VoUgRtuResult4Success> list = new ArrayList<>() ;
if(RtuUpgradeStateReceiverCtrl.cache != null && RtuUpgradeStateReceiverCtrl.cache.ugTaskId != null){
if(RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList != null && RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size() > 0) {
RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.forEach(rtu -> {
if(rtu.isOver){
if(rtu.state == UpgradeRtu.STATE_SUCCESS){
- VoUgRtuResult vo = new VoUgRtuResult() ;
+ VoUgRtuResult4Success vo = new VoUgRtuResult4Success() ;
vo.rtuAddr = rtu.rtuAddr ;
vo.result = "鍗囩骇鎴愬姛" ;
list.add(vo);
--
Gitblit v1.8.0