From 7d76b9e89baa29a1ae2e5e406d6d11dcca15325a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 12:25:11 +0800
Subject: [PATCH] fix:实测补偿修复
---
screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 107357d..d8e7cc7 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,11 +1,21 @@
package com.moral.api.websocket;
+import com.moral.api.entity.Device;
+import com.moral.api.entity.MonitorPoint;
+import com.moral.api.entity.Sensor;
+import com.moral.api.entity.UnitConversion;
+import com.moral.constant.RedisConstants;
+import lombok.Data;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PathVariable;
import javax.websocket.*;
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;
/**
@@ -17,23 +27,46 @@
**/
@ServerEndpoint("/singleDevice/{mac}")
@Component
+@Data
public class SingleDeviceServer {
//���������������������������������server������
public static CopyOnWriteArraySet<SingleDeviceServer> sockets = new CopyOnWriteArraySet<>();
+ public static RedisTemplate redisTemplate;
+
private Session session;
private String mac;
+ private Device deviceAlarmInfo;
+ private List<UnitConversion> unitConversions;
+
+ 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.CITY_AQI, areaCode);
+ if (ObjectUtils.isEmpty(this.regionAqi))
+ this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
sockets.add(this);
- System.out.println(mac);
}
@OnClose
@@ -52,11 +85,10 @@
public void sendMessage(String message) throws Exception {
if (this.session.isOpen()) {
- synchronized (session) {
- this.session.getBasicRemote().sendText(message);
- }
+ // synchronized (session) {
+ this.session.getBasicRemote().sendText(message);
+ // }
}
}
-
}
--
Gitblit v1.8.0