From 6e48dd3f327da941ca63e85b97992ff13a148434 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 10 五月 2022 09:46:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

---
 src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
index c4d49a8..ef4492f 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
@@ -22,6 +22,9 @@
 
 	public static final String DEVICE_PREFIX = "VMP_DEVICE_";
 
+	// 璁惧鍚屾瀹屾垚
+	public static final String DEVICE_SYNC_PREFIX = "VMP_DEVICE_SYNC_";
+
 	public static final String CACHEKEY_PREFIX = "VMP_CHANNEL_";
 
 	public static final String KEEPLIVEKEY_PREFIX = "VMP_KEEPALIVE_";
@@ -69,6 +72,7 @@
 
 	public static final String SYSTEM_INFO_NET_PREFIX = "VMP_SYSTEM_INFO_NET_";
 
+
 	//************************** redis 娑堟伅*********************************
 
 	// 娴佸彉鍖栫殑閫氱煡
@@ -83,9 +87,12 @@
 	// 绉诲姩浣嶇疆璁㈤槄閫氱煡
 	public static final String VM_MSG_SUBSCRIBE_MOBILE_POSITION = "mobileposition";
 
-	// 鎶ヨ璁㈤槄鐨勯�氱煡
+	// 鎶ヨ璁㈤槄鐨勯�氱煡锛堟敹鍒版姤璀﹀悜redis鍙戝嚭閫氱煡锛�
 	public static final String VM_MSG_SUBSCRIBE_ALARM = "alarm";
 
+	// 鎶ヨ閫氱煡鐨勫彂閫� 锛堟敹鍒皉edis鍙戝嚭鐨勯�氱煡锛岃浆鍙戠粰鍏朵粬骞冲彴锛�
+	public static final String VM_MSG_SUBSCRIBE_ALARM_RECEIVE= "alarm_receive";
+
 	// 璁惧鐘舵�佽闃呯殑閫氱煡
 	public static final String VM_MSG_SUBSCRIBE_DEVICE_STATUS = "device";
 

--
Gitblit v1.8.0