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 | 122 +++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 11 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 9f594a1..a4494e3 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;
@@ -84,15 +86,21 @@
private boolean hasReceivedSubscription(Session session) {
WsBo wsBo = getWsBoForSession(session.getId());
- String s = RedisUtil.get("user_" + wsBo.getUserId());
- if(null == s || s.isEmpty() && !wsBo.getToken().equals(s)){
+ String s = RedisUtil.get(wsBo.getUserId().toString());
+ if(StringUtils.isEmpty(s) || !wsBo.getToken().equals(s)){
closeSession(session, "用户未登录");
+ Map<String,Integer> map = new HashMap<>();
+ map.put("status",1);
+ pushMessage(session,JSONUtil.toJsonStr(map));
+ return false;
}
return wsBo != null;
}
@OnError
public void onError(Session session, @NonNull Throwable throwable) {
+ threadLocalData.remove(session.getId());
+ wsServers.remove(this);
log.error("连接发生报错: {}", throwable.getMessage());
throwable.printStackTrace();
}
@@ -100,6 +108,7 @@
@OnClose
public void onClose() {
int count = onlineCount.decrementAndGet();
+ threadLocalData.remove(session.getId());
wsServers.remove(this);
cancelScheduledTasks(); // 取消定时任务
log.info("服务端断开连接，当前连接的客户端数量为：{}", count);
@@ -117,6 +126,16 @@
try {
if(!message.equals("ping")){
WsBo bean = JSONUtil.toBean(message, WsBo.class);
+ if(null == bean){
+ closeSession(session,"没有订阅消息");
+ }
+ String s = RedisUtil.get(bean.getUserId().toString());
+ if(StringUtils.isEmpty(s)){
+ Map<String,Integer> map = new HashMap<>();
+ map.put("status",1);
+ pushMessage(session,JSONUtil.toJsonStr(map));
+ closeSession(session,"没有订阅消息");
+ }
threadLocalData.put(session.getId(), bean);
}
}catch (Exception e){
@@ -143,11 +162,14 @@
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) {
@@ -168,10 +190,22 @@
private void schedulePushMessage(Session session, String message) throws JsonProcessingException {
WsBo wsBo = getWsBoForSession(session.getId());
+
if (wsBo != null) {
+
+ String s = RedisUtil.get(wsBo.getUserId().toString());
+ if(StringUtils.isEmpty(s) || !s.equals(wsBo.getToken())){
+ Map<String,Integer> map = new HashMap<>();
+ map.put("status",1);
+ pushMessage(session,JSONUtil.toJsonStr(map));
+ closeSession(session,"登录状态失效");
+ }
+
+
long currentTime = System.currentTimeMillis();
long lastMessageTime = lastMessageTimeMap.getOrDefault(session, 0L);
int time = wsBo.getTime();
+
message = megFiltration(wsBo,message);
if (currentTime - lastMessageTime >= time * 1000) {
// 时间间隔达到要求，可以发送消息
@@ -179,14 +213,16 @@
lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
} else {
// 时间间隔未达到，不发送消息，可以记录日志或者其他操作
- log.info("距离上次发送消息时间未达到指定间隔，不发送消息。");
+// log.info("距离上次发送消息时间未达到指定间隔，不发送消息。");
}
+ }else{
+ pushMessage(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());
-
+ Map<String,Object> map = new HashMap<>();
String key = "config_";
String value = RedisUtil.get(key + wsBo.getUserId());
List<ConfigCurrency> currencies = null;
@@ -203,17 +239,22 @@
//查询币种
- if(null != wsBo.getCurrency()){
+ if(StringUtils.isNotEmpty(wsBo.getCurrency())){
redisValueMap = redisValueMap.stream()
.filter(data -> wsBo.getCurrency().equals(data.getBaseAsset()))
.collect(Collectors.toList());
}
//价差
- if(wsBo.getSpread() > 0){
+ if(wsBo.getSystemFiltration()){
redisValueMap = redisValueMap.stream()
- .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread())
+ .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()
@@ -236,15 +277,73 @@
.collect(Collectors.toList());
}
//自选标记
- if(null != wsBo.getIsMarker()){
- List<String> list = Arrays.asList(wsBo.getIsMarker().split(","));
+ String mark = RedisUtil.get(wsBo.getUserId() + "_mark");
+ if(StringUtils.isNoneEmpty(mark)){
+ List<String> list = Arrays.asList(mark.split(","));
redisValueMap.stream()
.filter(data -> list.contains(data.getBuyAndSell()))
.forEach(data -> data.setMarker(true));
}
+ map.put("uuid",wsBo.getUuid());
+ 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
+ BigDecimal buyTotalPriceA = new BigDecimal(a.getBuyTotalPrice());
+ BigDecimal buyTotalPriceB = new BigDecimal(b.getBuyTotalPrice());
+ BigDecimal sellTotalPriceA = new BigDecimal(a.getSellTotalPrice());
+ BigDecimal sellTotalPriceB = new BigDecimal(b.getSellTotalPrice());
+ BigDecimal spreadA = new BigDecimal(a.getSpread());
+ BigDecimal spreadB = new BigDecimal(b.getSpread());
+
+ // 检查 a 和 b 的买入总价或卖出总价是否大于 1000
+ boolean aBuyOrSellAbove1000 = buyTotalPriceA.compareTo(new BigDecimal("1000")) > 0 || sellTotalPriceA.compareTo(new BigDecimal("1000")) > 0;
+ boolean bBuyOrSellAbove1000 = buyTotalPriceB.compareTo(new BigDecimal("1000")) > 0 || sellTotalPriceB.compareTo(new BigDecimal("1000")) > 0;
+
+ if (aBuyOrSellAbove1000 && !bBuyOrSellAbove1000) {
+ return -1; // a 应排在 b 前面
+ } else if (!aBuyOrSellAbove1000 && bBuyOrSellAbove1000) {
+ return 1; // b 应排在 a 前面
+ } else {
+ // a 和 b 都大于 1000 或都小于等于 1000
+ // 先按照 spread 的降序排列
+ int spreadComparison = spreadB.compareTo(spreadA);
+ if (spreadComparison != 0) {
+ return spreadComparison; // 先按照 spread 排序
+ } else {
+ // 如果 spread 相同，再按照买入总价或卖出总价的升序排列
+ if (aBuyOrSellAbove1000) {
+ // 对于买入总价或卖出总价大于 1000 的记录
+ return buyTotalPriceA.compareTo(buyTotalPriceB); // 按照买入总价升序排序
+ } else {
+ // 对于买入总价或卖出总价小于等于 1000 的记录
+ return buyTotalPriceA.compareTo(buyTotalPriceB); // 可以选择卖出总价或买入总价的升序排序
+ }
+ }
+ }
+ }
+ });
}
private void pushMessage(Session session, String message) {
@@ -262,11 +361,12 @@
// 关闭会话的方法
private void closeSession(Session session, String reason) {
try {
+ threadLocalData.remove(session.getId());
session.close(new CloseReason(CloseReason.CloseCodes.UNEXPECTED_CONDITION, reason));
} catch (IOException e) {
log.error("强制断开连接----异常: {}", e.getMessage());
}
wsServers.remove(this);
- log.info("客户端未及时发送订阅消息，断开连接");
+ log.info(reason);
}
}
--
Gitblit v1.9.3