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-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java
index 3dc24c6..bb4cd7d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwTestClientStatus.java
@@ -4,10 +4,14 @@
public MwConfigVo confVo ;
- public ResStartVo startVo ;
-
+ public ResStartTcpConnectVo startVo ;
+
+ public ResStartRtuReportVo reportVo ;
+
public Integer count ;//mwTest涓婃姤鏁版嵁鏁伴噺
-
+
+ public Integer overCount ;//mwTest瀹屾垚鍏ㄩ儴涓婃姤鏁版嵁RTU鏁伴噺
+
public Boolean over ;//mwTest涓婃姤鏁版嵁缁撴潫
public Long seconds ;//mwTest涓婃姤鏁版嵁鐢ㄦ椂(绉�)
@@ -20,11 +24,11 @@
this.confVo = confVo;
}
- public ResStartVo getStartVo() {
+ public ResStartTcpConnectVo getStartVo() {
return startVo;
}
- public void setStartVo(ResStartVo startVo) {
+ public void setStartVo(ResStartTcpConnectVo startVo) {
this.startVo = startVo;
}
@@ -51,6 +55,20 @@
public void setSeconds(Long seconds) {
this.seconds = seconds;
}
-
-
+
+ public ResStartRtuReportVo getReportVo() {
+ return reportVo;
+ }
+
+ public void setReportVo(ResStartRtuReportVo reportVo) {
+ this.reportVo = reportVo;
+ }
+
+ public Integer getOverCount() {
+ return overCount;
+ }
+
+ public void setOverCount(Integer overCount) {
+ this.overCount = overCount;
+ }
}
--
Gitblit v1.8.0