From 7912b91040336c78ee45f9d330f492573ea0c06d Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Wed, 15 Jan 2025 09:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java | 3 ++-
 .../src/main/java/yq/common/webSocket/MyWebSocketHandler.java | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
index a5ed61c..03ce615 100644
--- a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
+++ b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
@@ -99,7 +99,8 @@ public class NoLogin {
     @GetMapping("/temp")
     public Map<String, Object>tempMap(String id)
     {
-        return redisCache.getCacheMap(id);
+        Map<String, Object> cacheMap = redisCache.getCacheMap(id);
+        return cacheMap;
     }
     //通过萤石云进行取流
     @GetMapping("/list")
diff --git a/yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java b/yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java
index 39f8218..9443a7c 100644
--- a/yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java
+++ b/yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java
@@ -59,13 +59,11 @@ public class MyWebSocketHandler implements WebSocketHandler {
                 Double temp1 = Convert.toDouble(cacheMap.get("temp"));
                 if(temp>temp1){
                     redisCache.setCacheMap(id,object);
-                    redisCache.expire(id,120,TimeUnit.SECONDS);
                 }
             }else {
                 redisCache.setCacheMap(id,object);
-                redisCache.expire(id,120,TimeUnit.SECONDS);
             }
-
+            redisCache.expire(id,5,TimeUnit.SECONDS);
         }
     }