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/VoOnLineIntake.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 6a4ab79..476b14a 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
@@ -6,7 +6,6 @@
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
-import java.io.Serial;
import java.util.Date;
/**
@@ -17,7 +16,7 @@
*/
@Data
-@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine"})
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "protocol", "protocolVersion", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"})
public class VoOnLineIntake implements BaseEntity {
private static final long serialVersionUID = 202405271703001L;
@@ -30,6 +29,14 @@
* 闃�鎺у櫒鍦板潃
*/
private String rtuAddr;
+ /**
+ * 闃�鎺у櫒閫氫俊鍗忚
+ */
+ private String protocol;
+ /**
+ * 闃�鎺у櫒閫氫俊鍗忚
+ */
+ private Integer protocolVersion;
/**
* 鍙栨按鍙ｇ紪鍙�
@@ -47,6 +54,12 @@
private Double lat;
/**
+ * 鐬椂娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double instantAmount;
+
+ /**
* 绱娴侀噺
*/
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
--
Gitblit v1.8.0