From d8eb22351c6d0bfe0c9f233edfd593538e6838c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 四月 2025 13:58:49 +0800
Subject: [PATCH] 1、表阀一体机协议开阀类型变化; 2、表阀一体机协议开关阀报中增加水价数据;

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java |   81 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 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
new file mode 100644
index 0000000..dd4a4c0
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
@@ -0,0 +1,81 @@
+package com.dy.pipIrrGlobal.voPr;
+
+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
+ * @date 2024-05-27 17:02
+ * @LastEditTime 2024-05-27 17:02
+ * @Description 鍦ㄧ嚎鍙栨按鍙e璞�
+ */
+
+@Data
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"})
+public class VoOnLineIntake implements BaseEntity {
+    private static final long serialVersionUID = 202405271703001L;
+
+    /**
+     * 鍙栨按鍙D
+     */
+    private String intakeId;
+
+    /**
+     * 闃�鎺у櫒鍦板潃
+     */
+    private String rtuAddr;
+
+    /**
+     * 鍙栨按鍙g紪鍙�
+     */
+    private String intakeNum;
+
+    /**
+     * 鍙栨按鍙g粡搴�
+     */
+    private Double lng;
+
+    /**
+     * 鍙栨按鍙g含搴�
+     */
+    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;
+
+    /**
+     * 鏄惁缁戝畾
+     */
+    private Boolean isBinded;
+
+
+    /**
+     * 鎶ヨ淇℃伅Json鏁扮粍鍜屾帴鏀跺埌鎶ヨ鏃堕棿
+     */
+    private String alarm;
+
+    /**
+     * 鎺ユ敹鍒版姤璀︽椂闂�
+     */
+    @JSONField(serialize = false)
+    private Date alarmDt;
+}

--
Gitblit v1.8.0