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-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java
index 2909d0b..5173e8f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java
@@ -10,24 +10,59 @@
*/
@Data
-@JsonPropertyOrder({"totalCountOfOnLine",
- "totalCountOfOffLine"
+@JsonPropertyOrder({"mTotalCountOfReport",
+ "mTotalCountOfNoReport",
+ "mTotalCountOfNeverReport",
+ "mTotalCountOfOpenValve",
+ "mTotalCountOfCloseValve",
+ "mTotalCountOfUnknownValve",
+ "mTotalCountOfAlarm",
+ "mTotalCountOfNoAlarm",
+ "mTotalCountOfUnknownAlarm"
})
public class VoMonitorInfo {
- private static final long serialVersionUID = 202502061348001L;
+ private static final long serialVersionUID = 202502061348321L;
/**
- * 浠庢煇鏃朵互鏉ワ紝鏇句笂鎶ヨ繃鏁版嵁鐨勬�绘暟
+ * 浠庢煇鏃朵互鏉ワ紝鏇句笂鎶ヨ繃鏁版嵁鐨勫彇姘村彛鎬绘暟
*/
- public Integer totalCountOfReport ;
+ public Integer mTotalCountOfReport;
/**
- * 浠庢煇鏃朵互鏉ワ紝鏈浘涓婃姤杩囨暟鎹殑鎬绘暟
+ * 浠庢煇鏃朵互鏉ワ紝鏈浘涓婃姤杩囨暟鎹殑鍙栨按鍙ｆ�绘暟
*/
- public Integer totalCountOfNoReport ;
+ public Integer mTotalCountOfNoReport;
/**
- * 浠庢湭涓婃姤杩囨暟鎹殑鎬绘暟
+ * 浠庢湭涓婃姤杩囨暟鎹殑鍙栨按鍙ｆ�绘暟
*/
- public Integer totalCountOfNeverReport ;
+ public Integer mTotalCountOfNeverReport;
+
+
+ /**
+ * 浠庢煇鏃朵互鏉ワ紝鏇鹃榾寮�鍙栨按鍙ｆ�绘暟
+ */
+ public Integer mTotalCountOfOpenValve ;
+ /**
+ * 浠庢煇鏃朵互鏉ワ紝鏇鹃榾鍏冲彇姘村彛鎬绘暟
+ */
+ public Integer mTotalCountOfCloseValve ;
+ /**
+ * 浠庢湭寮�杩囬榾鐨勫彇姘村彛鎬绘暟
+ */
+ public Integer mTotalCountOfNeverOpenValve ;
+
+
+ /**
+ * 浠庢煇鏃朵互鏉ワ紝鏇炬姤璀﹀彇姘村彛鎬绘暟
+ */
+ public Integer mTotalCountOfAlarm ;
+ /**
+ * 浠庢煇鏃朵互鏉ワ紝鏇炬棤鎶ヨ鍙栨按鍙ｆ�绘暟
+ */
+ public Integer mTotalCountOfNoAlarm ;
+ /**
+ * 浠庢湭鎶ヨ繃璀﹀彇姘村彛鎬绘暟
+ */
+ public Integer mTotalCountOfNeverAlarm ;
}
--
Gitblit v1.8.0