From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 37a7fee..a31da14 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
@@ -241,6 +241,7 @@
             rtu.currentPackage = 0 ;
             rtu.currentRamAddr = 0x00 ;
             rtu.lastDownDt = "" ;
+            rtu.lastDownDtAt = 0L ;
             rtu.reTryTimes = 0 ;
             rtu.isOver = false ;
         }else{
@@ -248,6 +249,7 @@
             rtu.currentPackage = 1 ;
             rtu.currentRamAddr = 0x00 ;
             rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+            rtu.lastDownDtAt = System.currentTimeMillis() ;
             rtu.reTryTimes = 0 ;
             rtu.isOver = false ;
         }
@@ -298,6 +300,7 @@
                 rtu.currentPackage = 1 ;
                 rtu.currentRamAddr = 0x00 ;
                 rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+                rtu.lastDownDtAt = System.currentTimeMillis() ;
                 rtu.reTryTimes++ ;
                 rtu.isOver = false ;
                 return ;
@@ -310,6 +313,7 @@
             rtu.currentPackage += 1 ;
             rtu.currentRamAddr = 0x00 + UpgradeRtu.RAMADDRADD ;
             rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+            rtu.lastDownDtAt = System.currentTimeMillis() ;
             rtu.isOver = false ;
         }
 

--
Gitblit v1.8.0