From 440f0f0b37a10c82e54f402be8d4d99c7406b4d4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 12 Aug 2024 17:48:22 +0800
Subject: [PATCH] 1

---
 websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
index 8ced992..a4494e3 100644
--- a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
+++ b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
@@ -216,10 +216,7 @@
 //                log.info("距离上次发送消息时间未达到指定间隔,不发送消息。");
             }
         }else{
-            Map<String,Integer> map = new HashMap<>();
-            map.put("status",1);
-            pushMessage(session,JSONUtil.toJsonStr(map));
-            closeSession(session,"没有订阅消息");
+            pushMessage(session,"没有订阅消息");
         }
     }
     private static final Gson gson = new Gson();
@@ -248,9 +245,16 @@
                     .collect(Collectors.toList());
         }
         //价差
-        redisValueMap = redisValueMap.stream()
-                .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread())
-                .collect(Collectors.toList());
+        if(wsBo.getSystemFiltration()){
+            redisValueMap = redisValueMap.stream()
+                    .filter(data -> Double.parseDouble(data.getSpread()) <= wsBo.getSpread())
+                    .collect(Collectors.toList());
+        }else{
+            redisValueMap = redisValueMap.stream()
+                    .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread() && Double.parseDouble(data.getSpread()) >= 1000)
+                    .collect(Collectors.toList());
+        }
+
         //最低金额
         if(null !=  wsBo.getMinAmount()){
             redisValueMap = redisValueMap.stream()
@@ -363,6 +367,6 @@
             log.error("强制断开连接----异常: {}", e.getMessage());
         }
         wsServers.remove(this);
-        log.info("客户端未及时发送订阅消息,断开连接");
+        log.info(reason);
     }
 }

--
Gitblit v1.9.3