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/voPr/VoOnLineIntake.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
index c0c3512..dd4a4c0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
@@ -1,8 +1,12 @@
package com.dy.pipIrrGlobal.voPr;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.fastjson2.annotation.JSONField;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
+
+import java.util.Date;
/**
* @author ZhuBaoMin
@@ -12,6 +16,7 @@
*/
@Data
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"})
public class VoOnLineIntake implements BaseEntity {
private static final long serialVersionUID = 202405271703001L;
@@ -31,6 +36,28 @@
private String intakeNum;
/**
+ * 鍙栨按鍙ｇ粡搴�
+ */
+ private Double lng;
+
+ /**
+ * 鍙栨按鍙ｇ含搴�
+ */
+ private Double lat;
+
+ /**
+ * 鐬椂娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double instantAmount;
+
+ /**
+ * 绱娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double totalAmount;
+
+ /**
* 鏄惁鍦ㄧ嚎
*/
private Boolean isOnLine;
@@ -39,4 +66,16 @@
* 鏄惁缁戝畾
*/
private Boolean isBinded;
+
+
+ /**
+ * 鎶ヨ淇℃伅Json鏁扮粍鍜屾帴鏀跺埌鎶ヨ鏃堕棿
+ */
+ private String alarm;
+
+ /**
+ * 鎺ユ敹鍒版姤璀︽椂闂�
+ */
+ @JSONField(serialize = false)
+ private Date alarmDt;
}
--
Gitblit v1.8.0