From 9a34c6b7a1a1bd98408849dc5dda44709727adb6 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 14 十一月 2024 11:10:23 +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/RtuUpgradeStateReceiverCtrl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
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 3c7ffa2..abf7883 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
@@ -8,8 +8,8 @@
import com.dy.common.util.DateTime;
import com.dy.common.util.ThreadJob;
import com.dy.common.webUtil.BaseResponse;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -117,7 +117,7 @@
UgRtuTask tpo = this.sv.selectLastTask() ;
if(tpo != null) {
UgRtuProgram ppo = this.sv.selectProgramById(tpo.programId);
- if (ppo == null) {
+ if (ppo != null) {
List<String> taskRtuAddrs = this.sv.selectAllRtuAddrByTask("" + tpo.id);
if (taskRtuAddrs != null && taskRtuAddrs.size() > 0) {
cache = new UpgradeInfo();
@@ -167,11 +167,8 @@
while (true){
for(UpgradeRtu rtu : cache.ugRtuStateList){
this.rtuUpgrade(rtu) ;
- hasRunning = this.statisticsNowUpgradeState() ;
- if(!hasRunning){
- break ;
- }
}
+ hasRunning = this.statisticsNowUpgradeState() ;
if(!hasRunning){
break ;
}
@@ -244,6 +241,7 @@
public boolean statisticsNowUpgradeState() {
boolean hasRunning = false ;
if(cache.ugRtuStateList != null && cache.ugRtuStateList.size() > 0){
+ cache.ugOverallState.init();
for(UpgradeRtu rtu : cache.ugRtuStateList){
if(rtu.state == UpgradeRtu.STATE_OFFLINE){
cache.ugOverallState.offLineTotal ++ ;
--
Gitblit v1.8.0