From a522f170fe22ffeb03e2b6bc81ae40243fb4cecb Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 05 Aug 2024 02:09:36 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 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 18e0dcc..80ccfe9 100644
--- a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
+++ b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
@@ -1,5 +1,6 @@
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;
@@ -9,6 +10,7 @@
import com.google.gson.GsonBuilder;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.example.pojo.ConfigCurrency;
import org.example.pojo.MarketDataOut;
import org.example.pojo.bo.WsBo;
@@ -67,11 +69,7 @@
@OnOpen
public void onOpen(Session session) {
- WsBo wsBo = getWsBoForSession(session.getId());
- String s = RedisUtil.get("user_" + wsBo.getUserId());
- if(null == s || s.isEmpty()){
- closeSession(session, "用户未登录");
- }
+
this.session = session;
int count = onlineCount.incrementAndGet();
wsServers.add(this);
@@ -88,7 +86,11 @@
private boolean hasReceivedSubscription(Session session) {
WsBo wsBo = getWsBoForSession(session.getId());
- return wsBo != null; // 简化逻辑
+ String s = RedisUtil.get("user_" + wsBo.getUserId());
+ if(null == s || s.isEmpty() && !wsBo.getToken().equals(s)){
+ closeSession(session, "用户未登录");
+ }
+ return wsBo != null;
}
@OnError
@@ -115,8 +117,10 @@
@OnMessage
public void onMessage(String message, Session session) throws IOException {
try {
- WsBo bean = JSONUtil.toBean(message, WsBo.class);
- threadLocalData.put(session.getId(), bean);
+ if(!message.equals("ping")){
+ WsBo bean = JSONUtil.toBean(message, WsBo.class);
+ threadLocalData.put(session.getId(), bean);
+ }
}catch (Exception e){
log.error("客户段订阅消息格式错误");
}
@@ -141,6 +145,8 @@
try {
schedulePushMessage(session, message);
} catch (Exception e) {
+ e.printStackTrace();
+ closeSession(session, "发送消息异常，断开链接");
log.error("发送消息时出现异常: {}", e.getMessage());
} finally {
sessionLock.unlock();
@@ -170,6 +176,7 @@
long currentTime = System.currentTimeMillis();
long lastMessageTime = lastMessageTimeMap.getOrDefault(session, 0L);
int time = wsBo.getTime();
+
message = megFiltration(wsBo,message);
if (currentTime - lastMessageTime >= time * 1000) {
// 时间间隔达到要求，可以发送消息
@@ -177,14 +184,14 @@
lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
} else {
// 时间间隔未达到，不发送消息，可以记录日志或者其他操作
- log.info("距离上次发送消息时间未达到指定间隔，不发送消息。");
+// log.info("距离上次发送消息时间未达到指定间隔，不发送消息。");
}
}
}
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());
-
+ Map<String,Object> map = new HashMap<>();
String key = "config_";
String value = RedisUtil.get(key + wsBo.getUserId());
List<ConfigCurrency> currencies = null;
@@ -192,17 +199,16 @@
ObjectMapper objectMapper = new ObjectMapper();
currencies = objectMapper.readValue(value, new TypeReference<List<ConfigCurrency>>() {});
}
- if(!CollectionUtils.isEmpty(currencies)){
- List<String> currency = currencies.stream().map(ConfigCurrency::getCurrency).collect(Collectors.toList());
- List<String> buy = currencies.stream().map(ConfigCurrency::getBuy).collect(Collectors.toList());
- List<String> sell = currencies.stream().map(ConfigCurrency::getSell).collect(Collectors.toList());
- redisValueMap = redisValueMap.stream()
- .filter(data -> !currency.contains(data.getBaseAsset()) && !buy.contains(data.getBuyingPlatform()) && !sell.contains(data.getSellPlatform()))
- .collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(currencies)) {
+ Set<String> filtrationSet = currencies.stream()
+ .map(f -> f.getCurrency() + f.getBuy() + f.getSell())
+ .collect(Collectors.toSet());
+ redisValueMap.removeIf(data -> filtrationSet.contains(data.getBuyAndSell()));
}
+
//查询币种
- if(null != wsBo.getCurrency()){
+ if(StringUtils.isNotEmpty(wsBo.getCurrency())){
redisValueMap = redisValueMap.stream()
.filter(data -> wsBo.getCurrency().equals(data.getBaseAsset()))
.collect(Collectors.toList());
@@ -226,17 +232,51 @@
.filter(data -> !list.contains(data.getBuyingPlatform()) && !list.contains(data.getSellPlatform()))
.collect(Collectors.toList());
}
+
+ //过滤数据
+ if(null != wsBo.getBuyAndSell()){
+ List<String> list = Arrays.asList(wsBo.getBuyAndSell().split(","));
+ redisValueMap = redisValueMap.stream()
+ .filter(data -> !list.contains(data.getBuyAndSell()))
+ .collect(Collectors.toList());
+ }
//自选标记
if(null != wsBo.getIsMarker()){
List<String> list = Arrays.asList(wsBo.getIsMarker().split(","));
redisValueMap.stream()
- .filter(data -> list.contains(data.getBaseAsset()))
+ .filter(data -> list.contains(data.getBuyAndSell()))
.forEach(data -> data.setMarker(true));
}
+ map.put("current",wsBo.getCurrent());
+ map.put("sizes",wsBo.getSizes());
+ map.put("total",redisValueMap.size());
+ sortBySpread(redisValueMap);
+ Integer current = 0;
+ if(wsBo.getCurrent() != 1){
+ current = (wsBo.getCurrent() - 1) * wsBo.getSizes();
+ }
+
+ // 确保 startIndex 在有效范围内
+ current = Math.min(current, redisValueMap.size());
+ // 计算子列表的结束索引
+ int endIndex = Math.min(current + wsBo.getSizes(), redisValueMap.size());
+ // 根据计算出的索引获取子列表
+ redisValueMap = redisValueMap.subList(current, endIndex);
+ map.put("data",redisValueMap);
Gson gson = new GsonBuilder().setPrettyPrinting().create();
- String json = gson.toJson(redisValueMap);
+ String json = gson.toJson(map);
return json;
}
+ public static void sortBySpread(List<MarketDataOut> marketDataList) {
+ Collections.sort(marketDataList, new Comparator<MarketDataOut>() {
+ @Override
+ public int compare(MarketDataOut a, MarketDataOut b) {
+ BigDecimal spreadA = new BigDecimal(a.getSpread());
+ BigDecimal spreadB = new BigDecimal(b.getSpread());
+ return spreadB.compareTo(spreadA);
+ }
+ });
+ }
private void pushMessage(Session session, String message) {
try {
--
Gitblit v1.9.3