From 1b92eb61fee576a51c58e34ede99fc199dcb3f13 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 19 Oct 2022 14:40:46 +0800
Subject: [PATCH] 上传浑南区空气质量日报功能
---
screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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..65f9a72 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
@@ -19,6 +19,7 @@
import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.UnitConversion;
+import com.moral.api.pojo.redisBean.SpecialDeviceInfoDTO;
import com.moral.constant.RedisConstants;
//���������������websocket
@@ -47,15 +48,15 @@
this.session = session;
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> orgInfo = (Map<String, Object>) deviceInfo.get("organization");
- String areaCode = String.valueOf(orgInfo.get("areaCode"));
- String cityCode = String.valueOf(orgInfo.get("cityCode"));
try {
- this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
- if (ObjectUtils.isEmpty(this.regionAqi))
- this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
+ //������������������
+ SpecialDeviceInfoDTO deviceInfo = (SpecialDeviceInfoDTO) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE, mac);
+ //���������������������������������guid,
+ String guid = deviceInfo.getSpecialDevice().getGuid();
+ if (!ObjectUtils.isEmpty(guid)) {
+ //������������aqi���������������������
+ this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, guid);
+ }
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0