From 4434ac67c79a51525b57f4b2020d24678a2b3f73 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 06 Jul 2023 11:46:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa

---
 screen-common/src/main/java/com/moral/constant/RedisConstants.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 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 e449781..ec037ea 100644
--- a/screen-common/src/main/java/com/moral/constant/RedisConstants.java
+++ b/screen-common/src/main/java/com/moral/constant/RedisConstants.java
@@ -35,6 +35,11 @@
     public static final String DEVICE = "device";
 
     /*
+     * redis���������������������key
+     * */
+    public static final String SPECIAL_DEVICE = "special_device";
+
+    /*
      * ���������������������������������������������������������������
      * ���������������hash
      * key���mac
@@ -78,5 +83,25 @@
      * */
     public static final String SPECIAL_DEVICE_INFO = "special_device_alarm_info";
 
+    /*
+     * redis���������������������key
+     * */
+    public static final String GOV_MONITOR_POINT = "gov_monitor_point";
+
+    /*
+     * redis���������aqi������key
+     * */
+    public static final String CITY_AQI = "city_aqi";
+
+    /*
+     * redis���������������������key
+     * */
+    public static final String CITY_WEATHER = "city_weather";
+
+    /*
+     * redis���������������������������������
+     * */
+    public static final String AQI_ANNOUNCEMENT = "aqi_announcement";
+
 
 }

--
Gitblit v1.8.0