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-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ParseParamsForUpV202404.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ParseParamsForUpV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ParseParamsForUpV202404.java index 52a2097..aa261ab 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ParseParamsForUpV202404.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/ParseParamsForUpV202404.java @@ -6,6 +6,7 @@ public class ParseParamsForUpV202404 implements CodeParseParams{ public String protocolName ;//鍗忚鍚嶇О + public Short protocolVersion ;//鍗忚鐗堟湰鍙� public String rtuAddr ;//鎺у埗鍣ㄥ潃 public String upCode ;//涓婅鎶ユ枃鏁版嵁涓殑鍔熻兘鐮� public String upHex ;//琛屾姤鏂囨暟鎹崄鍏繘鍒跺舰寮� @@ -16,21 +17,24 @@ public void clear(){ this.protocolName = null ; - this.rtuAddr = null ; + this.protocolVersion = null ; + this.rtuAddr = null ; this.upCode = null ; this.upHex = null ; this.upBuffer = null ; this.data = null ; } - public void setValue(String protocolName, - String rtuAddr, + public void setValue(String protocolName, + Short protocolVersion, + String rtuAddr, String upCode, String upHex, byte[] upBuffer, Data data){ this.protocolName = protocolName ; - this.rtuAddr = rtuAddr ; + this.protocolVersion = protocolVersion ; + this.rtuAddr = rtuAddr ; this.upCode = upCode ; this.upHex = upHex ; this.upBuffer = upBuffer ; -- Gitblit v1.8.0