From 276ce2ba5e91523f3c202cce0b0a8bae43630a5e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 六月 2025 10:37:21 +0800
Subject: [PATCH] 表阀一体协议与测控一体阀协议进行兼容时，阀门状态位判断未做兼容修改，本次进行修改并进行必要注释。
---
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