From 257da880e75699c3dbdd1a25c9430df7d1cdee38 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 14 Jul 2021 11:59:39 +0800
Subject: [PATCH] screen-manage websocket处理完成增加时间戳
---
screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java | 24 +++++++++++++++++++-----
1 files changed, 19 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..748efc3 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,19 @@
package com.moral.api.websocket;
+import com.moral.api.entity.Device;
+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.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,24 +25,31 @@
**/
@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 Map<String, Device> devicesInfo;
+ private List<UnitConversion> unitConversions;
@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.unitConversions = redisTemplate.opsForList().range(RedisConstants.UNIT_CONVERSION, 0, -1);
sockets.add(this);
System.out.println(mac);
- }
+}
@OnClose
public void onClose() {
@@ -52,11 +67,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