From a700bf4e6423e3ad9cbf5119eb46defad84c76b3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十一月 2024 13:46:51 +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 | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 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..c32acaa 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;
@@ -112,12 +112,20 @@
private static ThreadJob threadJob ;
+ protected void resetDemo(){
+ if(threadJob != null){
+ threadJob.stop() ;
+ threadJob = null ;
+ }
+ cache = null ;
+ }
+
protected void demo(){
if(cache == null){
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();
@@ -137,7 +145,17 @@
threadJob = new ThreadJob() {
@Override
public Object execute() throws Exception {
- runDemo() ;
+ while(!this.stop){
+ if(!runDemo()){
+ this.stop = true ;
+ }else{
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
return null;
}
};
@@ -162,25 +180,11 @@
}
}
}
- private void runDemo(){
- boolean hasRunning = true ;
- while (true){
- for(UpgradeRtu rtu : cache.ugRtuStateList){
- this.rtuUpgrade(rtu) ;
- hasRunning = this.statisticsNowUpgradeState() ;
- if(!hasRunning){
- break ;
- }
- }
- if(!hasRunning){
- break ;
- }
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ private boolean runDemo(){
+ for(UpgradeRtu rtu : cache.ugRtuStateList){
+ this.rtuUpgrade(rtu) ;
}
+ return this.statisticsNowUpgradeState() ;
}
private void rtuUpgrade(UpgradeRtu rtu){
if(rtu.lastDownDt == null){
@@ -244,6 +248,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