From 44180ee779c038ad628fcd847a0b8e2ca9b6f4ee Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 22 十一月 2024 10:46:17 +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 | 61 ++++++++++++++----------------
1 files changed, 28 insertions(+), 33 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 1add08d..7654ce3 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
@@ -226,36 +226,6 @@
//绂荤嚎鐨勶紝涓嶅鐞�
return ;
}
- int n = Integer.parseInt(new CreateRandom().create(2)) ;
- if(n == 4
- || n == 14
- || n == 24
- || n == 34
- || n == 44
- || n == 54
- || n == 64
- || n == 74
- || n == 84
- || n == 95
- || n == 45
- || n == 46
- || n == 47
- || n == 48
- || n == 49){
- if(rtu.currentPackage == 1){
- //1鍖呮
- rtu.state = UpgradeRtu.STATE_FAILONE ;
- return ;
- }
- }
-
- if(n == 45){
- if(rtu.currentPackage != 1){
- //鍗囨
- rtu.state = UpgradeRtu.STATE_FAIL ;
- return ;
- }
- }
if(rtu.currentPackage == rtu.totalPackage){
//鍗囩骇缁撴潫
@@ -263,9 +233,35 @@
rtu.isOver = true ;
return ;
}
+ if(rtu.reTryTimes >= 2){
+ //閲嶈瘯娆℃暟杈惧埌鏈�澶у��
+ if(rtu.state == UpgradeRtu.STATE_FAILONE ||
+ rtu.state == UpgradeRtu.STATE_FAIL){
+ //鍙堝け璐ヤ簡锛岃涓虹粨鏉熶簡
+ rtu.isOver = true ;
+ return ;
+ }
+ }
- if(rtu.state != UpgradeRtu.STATE_FAILONE &&
- rtu.state != UpgradeRtu.STATE_FAIL){
+ int n = Integer.parseInt(new CreateRandom().create(3)) ;
+ if(n == 540 || n == 541 || n == 542 || n == 543 || n == 544 || n == 545){
+ if(rtu.currentPackage == 1){
+ //1鍖呮
+ rtu.state = UpgradeRtu.STATE_FAILONE ;
+ return ;
+ }
+ }
+
+ if(n == 450 || n == 451 || n == 452 || n == 453 || n == 454 || n == 455){
+ if(rtu.currentPackage != 1){
+ //鍗囨
+ rtu.state = UpgradeRtu.STATE_FAIL ;
+ return ;
+ }
+ }
+
+ if(rtu.state == UpgradeRtu.STATE_FAILONE ||
+ rtu.state == UpgradeRtu.STATE_FAIL){
if(rtu.reTryTimes < 2){
rtu.state = UpgradeRtu.STATE_RUNNING ;
rtu.currentPackage = 1 ;
@@ -283,7 +279,6 @@
rtu.currentPackage += 1 ;
rtu.currentRamAddr = 0x00 + UpgradeRtu.RAMADDRADD ;
rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
- rtu.reTryTimes = 0 ;
rtu.isOver = false ;
}
--
Gitblit v1.8.0