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/UpgradeUnit.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/UpgradeUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java index c1f02d0..3abc7b6 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java @@ -39,7 +39,7 @@ } /** - * 鍒濆鍖栦笂琛屾暟鎹鐞嗕换鍔℃睜 + * 鍒濆鍖� */ @Override public void start(UnitCallbackInterface callback) throws Exception { @@ -91,9 +91,9 @@ * @param code * @param callback */ - public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callback){ + public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callback, Object ...objects){ if(manager != null ){ - manager.trigger(rtuAddr, code, protocolName, protocolVersion, callback); + manager.trigger(rtuAddr, code, protocolName, protocolVersion, callback, objects); } } -- Gitblit v1.8.0