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-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
index 39943c2..9caed79 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
@@ -69,7 +69,7 @@
this.task.forceOver();
}
this.task = new UpgradeTask();
- this.task.initOption(this.lastOpenMaxGoOn, this.failTryTimes, this.ugMaxRtuSameTime);
+ this.task.initOption(this.openNoUpgrade, this.lastOpenMaxGoOn, this.failTryTimes, this.ugMaxRtuSameTime);
this.task.setTask(vo);
this.nowNotifyTimesAfterOver = 0 ;
this.monitorFirst = true ;
@@ -120,9 +120,9 @@
* @param protocolVersion 涓婅鏁版嵁瀵瑰簲鐨勫崗璁増鏈彿
* @param callbackCom 鍥炶皟鍑芥暟锛屽鐞嗕笅琛屽懡浠�
*/
- public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callbackCom){
+ public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callbackCom, Object ...objects){
if(task != null && !task.taskIsOver){
- this.task.trigger(rtuAddr, code, protocolName, protocolVersion, callbackCom);
+ this.task.trigger(rtuAddr, code, protocolName, protocolVersion, callbackCom, objects);
}
}
--
Gitblit v1.8.0