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/channel/tcp/PrefixedDataAvailableStatus.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java
index 2045a91..3fe03b0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java
@@ -9,6 +9,8 @@
private Integer status ;
private Integer dataLen ;
+ public String protocolName;
+ public Short protocolVersion;
public PrefixedDataAvailableStatus(){
status = null ;
@@ -44,9 +46,11 @@
* @return 鐘舵��
*/
@SuppressWarnings("unused")
- public PrefixedDataAvailableStatus adjoined(Integer dataLen){
+ public PrefixedDataAvailableStatus adjoined(Integer dataLen, String protocolName, Short protocolVersion){
this.status = status_adjoin ;
this.dataLen = dataLen ;
+ this.protocolName = protocolName ;
+ this.protocolVersion = protocolVersion ;
return this ;
}
@@ -56,9 +60,11 @@
* @return 鐘舵��
*/
@SuppressWarnings("unused")
- public PrefixedDataAvailableStatus completed(Integer dataLen){
+ public PrefixedDataAvailableStatus completed(Integer dataLen, String protocolName, Short protocolVersion){
this.status = status_complete ;
this.dataLen = dataLen ;
+ this.protocolName = protocolName ;
+ this.protocolVersion = protocolVersion ;
return this ;
}
--
Gitblit v1.8.0