From 0984290ca2a75cf0316c3ca312bf8026b4edcf3e Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:38 +0800
Subject: [PATCH] 继续优化docker配置: 1.启动命令增加ASSIST_JVM_CONFIG和WVP_JVM_CONFIG两个字段,方便配置JVM参数 2.修复一处错误,application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
index bbb304c..8176c1c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
@@ -14,6 +14,11 @@
 	private String deviceId;
 
 	/**
+	 * 閫氶亾Id
+	 */
+	private String channelId;
+
+	/**
 	 * 鎶ヨ绾у埆, 1涓轰竴绾ц鎯�, 2涓轰簩绾ц鎯�, 3涓轰笁绾ц鎯�, 4涓哄洓绾� 璀︽儏-
 	 */
 	private String alarmPriority;
@@ -121,4 +126,12 @@
 	public void setAlarmType(String alarmType) {
 		this.alarmType = alarmType;
 	}
+
+	public String getChannelId() {
+		return channelId;
+	}
+
+	public void setChannelId(String channelId) {
+		this.channelId = channelId;
+	}
 }

--
Gitblit v1.8.0