From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] （1）升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败； （2）升级状态向Remote模块通知时，当升级任务结束后，仍要向remote模块通知可配置的次数；
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeRtuDev.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeRtuDev.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeRtuDev.java
index 8e02203..6b12947 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeRtuDev.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeRtuDev.java
@@ -39,6 +39,7 @@
this.currentPackage = 0 ;
this.currentRamAddr = 0 ;
this.lastDownDt = "" ;
+ this.lastDownDtAt = 0L ;
this.reTryTimes = 0 ;
this.isOver = false ;
}
@@ -53,6 +54,7 @@
this.currentPackage = 0 ;
this.currentRamAddr = 0 ;
this.lastDownDt = "" ;
+ this.lastDownDtAt = 0L ;
this.reTryTimes = 0 ;
this.isOver = false ;
}
@@ -76,6 +78,7 @@
if(code.equals(UpgradeCode.cd_9601)){
//涓嬪彂閰嶇疆杩斿洖
this.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ this.lastDownDtAt = System.currentTimeMillis() ;
callbackCom.call(createCommand1602(protocolName, protocolVersion, currentPackage, currentRamAddr, softData));//涓嬪彂鏁版嵁鍖呮寚浠�
}else if(code.equals(UpgradeCode.cd_9602)){
//涓嬪彂鏁版嵁鍖呰繑鍥�
@@ -83,9 +86,11 @@
currentRamAddr += RAMADDRADD ;
if(currentPackage < totalPackage){
this.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ this.lastDownDtAt = System.currentTimeMillis() ;
callbackCom.call(createCommand1602(protocolName, protocolVersion, currentPackage, currentRamAddr, softData));
}else{
this.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ this.lastDownDtAt = System.currentTimeMillis() ;
callbackCom.call(createCommand1603(protocolName, protocolVersion));//涓嬪彂鏍￠獙鎸囦护
}
}else if(code.equals(UpgradeCode.cd_9603)){
@@ -141,6 +146,7 @@
this.currentRamAddr = 0 ;
this.isOver = false ;
this.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ this.lastDownDtAt = System.currentTimeMillis() ;
}
/**
@@ -150,6 +156,7 @@
this.isOver = true ;//鍗囩骇瀹屾垚
this.state = STATE_SUCCESS ;
this.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ this.lastDownDtAt = System.currentTimeMillis() ;
}
@Override
--
Gitblit v1.8.0