From 5dec8dcc45b40a1d7acdf05be2f2ffd00759535e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 07 六月 2025 16:11:30 +0800
Subject: [PATCH] 1、*-global.yml配置文件中增加有关萤石云应用的配置; 2、萤石云视频监控相关数据库设计(萤石应用+视频监控站); 3、remote模块增加定时下载萤石应用AccessToken的监听器,及网络下载逻辑,数据库存储等功能实现;

---
 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