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 MaptempMap(String id) { - return redisCache.getCacheMap(id); + Map 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); } }