From d3b8905de283ea2e28c06f2c80f72397723b8d77 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 15:33:25 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 7419fbf..3e5ad9a 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,14 @@
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.*;
@@ -22,6 +25,7 @@
* @Date 2021/6/15 13:56
* @Version TODO
**/
+
@ServerEndpoint("/singleDevice/{mac}")
@Component
@Data
@@ -30,21 +34,40 @@
//���������������������������������server������
public static CopyOnWriteArraySet<SingleDeviceServer> sockets = new CopyOnWriteArraySet<>();
+ public static RedisTemplate redisTemplate;
+
private Session session;
private String mac;
- public static RedisTemplate redisTemplate;
+ private Device deviceAlarmInfo;
- private Map<String,Device> devicesInfo;
+ 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.devicesInfo = redisTemplate.opsForHash().entries(RedisConstants.DEVICE_INFO);
+ 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
@@ -63,11 +86,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