From 72b5d23ab48368c9a8da28b91d0da1e6d7d1c4f0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 22 十一月 2024 16:24:44 +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 |   64 ++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 23 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 7d5409d..897e5a7 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,22 +226,25 @@
             //绂荤嚎鐨勶紝涓嶅鐞�
             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 == rtu.totalPackage){
+            //鍗囩骇缁撴潫
+            rtu.state = UpgradeRtu.STATE_SUCCESS ;
+            rtu.isOver = true ;
+            return ;
+        }
+        if(rtu.reTryTimes >= 2){
+            //閲嶈瘯娆℃暟杈惧埌鏈�澶у��
+            if(rtu.state == UpgradeRtu.STATE_FAILONE ||
+                    rtu.state == UpgradeRtu.STATE_FAIL){
+                //鍙堝け璐ヤ簡锛岃涓虹粨鏉熶簡
+                rtu.isOver = true ;
+                return ;
+            }
+        }
+
+        int n = Integer.parseInt(new CreateRandom().create(3)) ;
+        if(n == 540 || n == 541 || n == 542 || n == 543 || n == 544 || n == 545 || n == 546 || n == 547 || n == 548 || n == 549 ){
             if(rtu.currentPackage == 1){
                 //1鍖呮
                 rtu.state = UpgradeRtu.STATE_FAILONE ;
@@ -249,7 +252,7 @@
             }
         }
 
-        if(n == 45){
+        if(n == 450 || n == 451 || n == 452 || n == 453 || n == 454 || n == 455){
             if(rtu.currentPackage != 1){
                 //鍗囨
                 rtu.state = UpgradeRtu.STATE_FAIL ;
@@ -257,11 +260,17 @@
             }
         }
 
-        if(rtu.currentPackage == rtu.totalPackage){
-            //鍗囩骇缁撴潫
-            rtu.state = UpgradeRtu.STATE_SUCCESS ;
-            rtu.isOver = true ;
-            return ;
+        if(rtu.state == UpgradeRtu.STATE_FAILONE ||
+                rtu.state == UpgradeRtu.STATE_FAIL){
+            if(rtu.reTryTimes < 2){
+                rtu.state = UpgradeRtu.STATE_RUNNING ;
+                rtu.currentPackage = 1 ;
+                rtu.currentRamAddr = 0x00 ;
+                rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+                rtu.reTryTimes++ ;
+                rtu.isOver = false ;
+                return ;
+            }
         }
 
         if(rtu.state != UpgradeRtu.STATE_FAILONE &&
@@ -270,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 ;
         }
 
@@ -306,6 +314,16 @@
                 }
             }
         }
+        if(!hasRunning){
+            cache.ugOverallState.allOver = true ;
+        }
+        if(cache.ugOverallState.allOver){
+            if(cache.ugRtuStateList != null && cache.ugRtuStateList.size() > 0){
+                for(UpgradeRtu rtu : cache.ugRtuStateList){
+                    rtu.isOver = true ;
+                }
+            }
+        }
         return hasRunning ;
     }
 }

--
Gitblit v1.8.0