From 118c93cad99d502dc29c12edf75355276832e231 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 15:07:09 +0800
Subject: [PATCH] fix:实测补偿修复
---
screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java b/screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java
index fa6fd33..afc907f 100644
--- a/screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java
+++ b/screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java
@@ -1,3 +1,4 @@
+/*
package com.moral.api.websocket;
import com.moral.api.entity.Device;
@@ -18,13 +19,15 @@
import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;
+*/
/**
* @ClassName SingleDeviceServer
* @Description TODO
* @Author ���������
* @Date 2021/6/15 13:56
* @Version TODO
- **/
+ **//*
+
@ServerEndpoint("/singleDevice/{mac}")
@Component
@Data
@@ -45,19 +48,22 @@
private Map<String, Object> regionAqi;
+ private Map<String,Object> adjustFormula;
+
@OnOpen
public void onOpen(Session session, @PathParam("mac") String mac) throws Exception {
this.session = session;
this.mac = mac;
this.deviceAlarmInfo = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
this.unitConversions = redisTemplate.opsForList().range(RedisConstants.UNIT_CONVERSION, 0, -1);
+ this.adjustFormula = redisTemplate.opsForHash().entries("adjust_"+mac);
//���������������������������AQI������������������
Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
Map<String, Object> monitorPointMap = (Map<String, Object>) deviceInfo.get("monitorPoint");
String areaCode = String.valueOf(monitorPointMap.get("areaCode"));
String cityCode = String.valueOf(monitorPointMap.get("cityCode"));
try {
- this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
+ this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, areaCode);
if (ObjectUtils.isEmpty(this.regionAqi))
this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
} catch (Exception e) {
@@ -89,3 +95,4 @@
}
}
+*/
--
Gitblit v1.8.0