From 1a8d8d019e5ddc8101f8d9556bbb9fce4b96d861 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 04 Sep 2023 13:25:29 +0800
Subject: [PATCH] fix:数据调整
---
screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java | 25 +++++++++++++++++--------
1 files changed, 17 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..c11968f 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
@@ -1,5 +1,6 @@
package com.moral.api.websocket;
+import com.moral.api.entity.Device;
import lombok.Data;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -19,6 +20,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
@@ -36,6 +38,10 @@
private String mac;
+ private SpecialDevice deviceAlarmInfo;
+
+ private Map<String, Object> adjustFormula;
+
private SpecialDevice specialDevice;
private Map<String, Object> regionAqi;
@@ -46,16 +52,19 @@
public void onOpen(Session session, @PathParam("mac") String mac) {
this.session = session;
this.mac = mac;
+ this.deviceAlarmInfo = (SpecialDevice) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE_INFO, mac);
+ this.unitConversions = redisTemplate.opsForList().range(RedisConstants.UNIT_CONVERSION, 0, -1);
+ this.adjustFormula = redisTemplate.opsForHash().entries("adjust_"+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