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/MidResultFromRtu.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
index e6efa2e..a7464d6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java
@@ -11,9 +11,11 @@
}
public String commandId ;//鍙戦�佸懡浠ょ殑ID锛屽鏋滄槸鍛戒护缁撴灉锛屽苟涓斿尮閰嶄簡涓嬪彂鍛戒护锛屾鍊间笉涓虹┖
-
+
+ public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
public String protocolName ;//鍗忚鍚嶇О
- public String rtuAddr ;//IMEI鍙�
+ public Short protocolVersion ;//鍗忚鐗堟湰鍙�
+ public String rtuAddr ;//Rtu鍦板潃
public String upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
public String upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
public byte[] upBuffer ;//涓婅鏁版嵁瀛楄妭鏁扮粍
@@ -25,11 +27,15 @@
ProtocolUnit.getInstance().adapter.getSingleActionFromRtu(this.protocolName).doAction(this);
}
- public void setCommandId(String commandId){
+ public void matchedCommand(String commandId, String rtuResultSendWebUrl){
this.commandId = commandId ;
if(this.data != null){
this.data.setCommandId(commandId);
}
+ this.rtuResultSendWebUrl = rtuResultSendWebUrl ;
+ if(this.data != null){
+ this.data.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ }
}
}
--
Gitblit v1.8.0