From 708e35e4df613836db1289820d82ab0377bf0442 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 17 Oct 2024 22:25:27 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java | 154 +++++++++++++++++++++++++++++++++------------------
1 files changed, 100 insertions(+), 54 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..eea67d1 100644
--- a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
+++ b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
@@ -1,10 +1,10 @@
package org.example.websocket.server;
-import cn.hutool.core.util.NumberUtil;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -17,29 +17,23 @@
import org.example.util.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
/**
* @ClassDescription: websocket服务端
@@ -58,7 +52,7 @@
private static final Map<String, WsBo> threadLocalData = new ConcurrentHashMap<>();
@Autowired
- @Qualifier("threadPoolTaskExecutor")
+ @Qualifier("markthreadPoolTaskExecutor")
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
// 定义常量：任务检查的超时时间(秒)
@@ -99,8 +93,7 @@
@OnError
public void onError(Session session, @NonNull Throwable throwable) {
- threadLocalData.remove(session.getId());
- wsServers.remove(this);
+ onClose();
log.error("连接发生报错: {}", throwable.getMessage());
throwable.printStackTrace();
}
@@ -127,14 +120,16 @@
if(!message.equals("ping")){
WsBo bean = JSONUtil.toBean(message, WsBo.class);
if(null == bean){
- closeSession(session,"没有订阅消息");
+ log.error("没有订阅消息");
+ closeSession(session,null);
}
String s = RedisUtil.get(bean.getUserId().toString());
if(StringUtils.isEmpty(s)){
+ log.error("未登录");
Map<String,Integer> map = new HashMap<>();
map.put("status",1);
pushMessage(session,JSONUtil.toJsonStr(map));
- closeSession(session,"没有订阅消息");
+ closeSession(session,null);
}
threadLocalData.put(session.getId(), bean);
}
@@ -150,36 +145,81 @@
return sessionLocks.get(sessionId);
}
+// public void sendMessageToAll(String message) {
+// List<CompletableFuture<Void>> futures = new ArrayList<>();
+// wsServers.forEach(ws -> {
+// futures.add(CompletableFuture.runAsync(() -> {
+// try {
+// Session session = ws.session;
+// if (session != null && session.isOpen()) {
+// Lock sessionLock = getSessionLock(session.getId());
+// sessionLock.lock();
+// try {
+// schedulePushMessage(session, message);
+// } catch (Exception e) {
+// e.printStackTrace();
+// closeSession(session, "发送消息异常，断开链接");
+// log.error("发送消息时出现异常: {}", e.getMessage());
+// } finally {
+// sessionLock.unlock();
+// }
+// } else {
+// closeSession(session, "会话不存在或已关闭");
+// log.error("会话不存在或已关闭，无法发送消息");
+// }
+// } catch (Exception e) {
+// log.error("处理消息失败: {}", e.getMessage());
+// }
+// }, threadPoolTaskExecutor));
+// });
+//
+// // 等待所有任务执行完成
+// CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+// }
+
public void sendMessageToAll(String message) {
List<CompletableFuture<Void>> futures = new ArrayList<>();
+
+ // 收集所有活动的会话
+ List<Session> activeSessions = new ArrayList<>();
wsServers.forEach(ws -> {
+ Session session = ws.session;
+ if (session != null && session.isOpen()) {
+ activeSessions.add(session);
+ } else {
+ closeSession(session, "会话不存在或已关闭");
+ log.error("会话不存在或已关闭，无法发送消息");
+ }
+ });
+
+ // 并发处理所有活动的会话
+ activeSessions.forEach(session -> {
futures.add(CompletableFuture.runAsync(() -> {
+ Lock sessionLock = getSessionLock(session.getId());
+ sessionLock.lock();
try {
- Session session = ws.session;
- if (session != null && session.isOpen()) {
- Lock sessionLock = getSessionLock(session.getId());
- sessionLock.lock();
- try {
- schedulePushMessage(session, message);
- } catch (Exception e) {
- e.printStackTrace();
- closeSession(session, "发送消息异常，断开链接");
- log.error("发送消息时出现异常: {}", e.getMessage());
- } finally {
- sessionLock.unlock();
- }
- } else {
- closeSession(session, "会话不存在或已关闭");
- log.error("会话不存在或已关闭，无法发送消息");
- }
+ schedulePushMessage(session, message);
} catch (Exception e) {
- log.error("处理消息失败: {}", e.getMessage());
+ log.error("发送消息时出现异常: {}", e.getMessage());
+ closeSession(session, "发送消息异常，断开链接");
+ } finally {
+ sessionLock.unlock();
}
}, threadPoolTaskExecutor));
});
- // 等待所有任务执行完成
- CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+ CompletableFuture<Void> allFutures = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+ try {
+ allFutures.join(); // 等待所有任务完成
+ } finally {
+ futures.clear(); // 清理未使用的 futures 列表
+ }
+ }
+
+
+ @PreDestroy
+ public void shutdownExecutor() {
+ threadPoolTaskExecutor.shutdown();
}
private WsBo getWsBoForSession(String sessionId) {
@@ -206,22 +246,24 @@
long lastMessageTime = lastMessageTimeMap.getOrDefault(session, 0L);
int time = wsBo.getTime();
- message = megFiltration(wsBo,message);
- if (currentTime - lastMessageTime >= time * 1000) {
- // 时间间隔达到要求，可以发送消息
+ if(wsBo.getPushNow()){
+ message = megFiltration(wsBo,message);
pushMessage(session, message);
lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
- } else {
- // 时间间隔未达到，不发送消息，可以记录日志或者其他操作
-// log.info("距离上次发送消息时间未达到指定间隔，不发送消息。");
+ wsBo.setPushNow(false);
+ }else{
+ message = megFiltration(wsBo,message);
+ if (currentTime - lastMessageTime >= time * 1000) {
+ // 时间间隔达到要求，可以发送消息
+ pushMessage(session, message);
+ lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
+ }
}
- }else{
- Map<String,Integer> map = new HashMap<>();
- map.put("status",1);
- pushMessage(session,JSONUtil.toJsonStr(map));
- closeSession(session,"没有订阅消息");
}
}
+
+
+
private static final Gson gson = new Gson();
private String megFiltration(WsBo wsBo,String message) throws JsonProcessingException {
List<MarketDataOut> redisValueMap = gson.fromJson(message, new TypeToken<List<MarketDataOut>>() {}.getType());
@@ -235,8 +277,10 @@
}
if (!CollectionUtils.isEmpty(currencies)) {
Set<String> filtrationSet = currencies.stream()
- .map(f -> f.getCurrency() + f.getBuy() + f.getSell())
+ .map(f -> f.getCurrency() + f.getBuy() + f.getSell()) //组合过滤 ，暂时不使用，直接过滤整个币种
+// .map(f -> f.getCurrency())
.collect(Collectors.toSet());
+// redisValueMap.removeIf(data -> filtrationSet.contains(data.getBaseAsset()));
redisValueMap.removeIf(data -> filtrationSet.contains(data.getBuyAndSell()));
}
@@ -249,8 +293,9 @@
}
//价差
redisValueMap = redisValueMap.stream()
- .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread())
+ .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread() && Double.parseDouble(data.getSpread()) <= 1000)
.collect(Collectors.toList());
+
//最低金额
if(null != wsBo.getMinAmount()){
redisValueMap = redisValueMap.stream()
@@ -354,15 +399,16 @@
}
}
- // 关闭会话的方法
private void closeSession(Session session, String reason) {
try {
- threadLocalData.remove(session.getId());
- session.close(new CloseReason(CloseReason.CloseCodes.UNEXPECTED_CONDITION, reason));
+ if (session != null && session.isOpen()) {
+ wsServers.remove(this);
+ log.info(reason);
+ session.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, reason));
+ }
} catch (IOException e) {
- log.error("强制断开连接----异常: {}", e.getMessage());
+ log.error("关闭会话时出现异常: {}", e.getMessage());
}
- wsServers.remove(this);
- log.info("客户端未及时发送订阅消息，断开连接");
}
+
}
--
Gitblit v1.9.3