From 6f12948893fcc846dfb32aa861c473a842edcd56 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:46:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-common/src/main/java/com/moral/constant/RedisConstants.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/RedisConstants.java b/screen-common/src/main/java/com/moral/constant/RedisConstants.java
index db0ec8c..bbc6324 100644
--- a/screen-common/src/main/java/com/moral/constant/RedisConstants.java
+++ b/screen-common/src/main/java/com/moral/constant/RedisConstants.java
@@ -38,4 +38,24 @@
* ������������������������
* */
public static final String STATE = "state";
+
+ /*
+ * ���������������������������������������������������������������
+ * ���������������hash
+ * key���mac
+ * value���Device
+ * ���������������Map<String,Device>
+ * */
+ public static final String DEVICE_INFO = "device_alarm_info";
+
+ /*
+ * ������������������������
+ * */
+ public static final String ADJUST = "adjust";
+
+ /*
+ * ������������������
+ * */
+ public static final String DEVICE_DATA = "data";
+
}
--
Gitblit v1.8.0