From f8b2e59a82702a790c383a8ecd90c708c76e2488 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 05 六月 2025 17:51:59 +0800
Subject: [PATCH] 增量开发MQTT协议、功能模块,上下行命令(消息)等

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java
index 311d47f..adea005 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java
@@ -15,7 +15,7 @@
  * @Description
  */
 @Data
-@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address"})
+@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address", "controllerId", "rtuAddr", "protocol"})
 public class VoAllIntake implements BaseEntity {
     private static final long serialVersionUID = 202412161003001L;
 
@@ -95,4 +95,20 @@
      * 鍦板潃
      */
     private String address;
+
+    /**
+     * 闃�鎺у櫒ID
+     */
+    @JSONField(serializeUsing = ObjectWriterImplToString.class)
+    private Long controllerId;
+
+    /**
+     * RTU鍦板潃
+     */
+    private String rtuAddr;
+
+    /**
+     * 閫氳鍗忚
+     */
+    private String protocol;
 }

--
Gitblit v1.8.0