From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:27:35 +0800
Subject: [PATCH] 优化虚拟卡占用逻辑，占用时写入取水口编号，解除占用时清空虚拟卡编号；工单使用的4个表
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 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 01f6c46..c869671 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,6 +1,8 @@
package com.dy.pipIrrGlobal.voPr;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
/**
@@ -11,6 +13,7 @@
*/
@Data
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine"})
public class VoOnLineIntake implements BaseEntity {
private static final long serialVersionUID = 202405271703001L;
@@ -30,7 +33,34 @@
private String intakeNum;
/**
+ * 鍙栨按鍙ｇ粡搴�
+ */
+ private Double lng;
+
+ /**
+ * 鍙栨按鍙ｇ含搴�
+ */
+ private Double lat;
+
+ /**
+ * 绱娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double totalAmount;
+
+ /**
* 鏄惁鍦ㄧ嚎
*/
private Boolean isOnLine;
+
+ /**
+ * 鏄惁缁戝畾
+ */
+ private Boolean isBinded;
+
+
+ /**
+ * 鎶ヨ淇℃伅Json鏁扮粍
+ */
+ private String alarm;
}
--
Gitblit v1.8.0