From 327267727c36cef76ee554e1ad97099180cd4f13 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 09:08:37 +0800
Subject: [PATCH] screen-manage                  单位转换信息添加缓存

---
 screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 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..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
@@ -2,6 +2,7 @@
 
 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;
@@ -30,22 +31,25 @@
     //���������������������������������server������
     public static CopyOnWriteArraySet<SingleDeviceServer> sockets = new CopyOnWriteArraySet<>();
 
+    public static RedisTemplate redisTemplate;
+
     private Session session;
 
     private String mac;
 
-    public static RedisTemplate redisTemplate;
+    private Map<String, Device> devicesInfo;
 
-    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() {
@@ -63,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