From 7b38f4ec223e9480c4de2824782fe3695a25d848 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 06 十二月 2024 11:19:16 +0800
Subject: [PATCH] 修改升级过程逻辑，RTU上报数据后触发升级过程中，首先判断是否因为阀门是开启状态而不能升级
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeResSv.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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..9e7d9cc 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
@@ -87,7 +87,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("")){
@@ -117,6 +118,11 @@
vo.rtuAddr = rtu.rtuAddr ;
vo.result = "绂荤嚎" ;
list.add(vo);
+ }else if(rtu.state == UpgradeRtu.STATE_FAILOPEN){
+ VoUgRtuResult vo = new VoUgRtuResult() ;
+ vo.rtuAddr = rtu.rtuAddr ;
+ vo.result = "闃�寮�" ;
+ list.add(vo);
}else if(rtu.state == UpgradeRtu.STATE_FAILONE){
VoUgRtuResult vo = new VoUgRtuResult() ;
vo.rtuAddr = rtu.rtuAddr ;
--
Gitblit v1.8.0