From 86c06b0f6f30099b436814ab223121aa8239081a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 16 Sep 2021 10:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java b/screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java
index fd31b01..ebb0ed4 100644
--- a/screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java
+++ b/screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java
@@ -48,7 +48,7 @@
this.mac = mac;
this.specialDevice = (SpecialDevice) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE_INFO, mac);
//���������������������������AQI������������������
- Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
+ /*Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
Map<String, Object> orgInfo = (Map<String, Object>) deviceInfo.get("organization");
String areaCode = String.valueOf(orgInfo.get("areaCode"));
String cityCode = String.valueOf(orgInfo.get("cityCode"));
@@ -58,7 +58,7 @@
this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
} catch (Exception e) {
e.printStackTrace();
- }
+ }*/
sockets.add(this);
}
--
Gitblit v1.8.0