From 738d92406da5313021bd9a092cadbc2a24d88034 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 26 Jul 2024 10:36:31 +0800
Subject: [PATCH] 1
---
.idea/gradle.xml | 1
websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java | 3
websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java | 2
websocketSerivce/src/main/java/org/example/task/MarketDataTask.java | 2
websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java | 101 +++++++++++++++++++++++----------
websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java | 20 ++++++
6 files changed, 96 insertions(+), 33 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3f0f01e..93825e4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
diff --git a/websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java b/websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java
index 5ca6371..3e4cbff 100644
--- a/websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java
+++ b/websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java
@@ -43,5 +43,6 @@
//服务器时间
private String servceTime;
-
+ //自选标记
+ private boolean isMarker = false;
}
diff --git a/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java b/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
index f3ab924..89b6414 100644
--- a/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
+++ b/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
@@ -2,6 +2,9 @@
import lombok.Data;
+import java.util.List;
+import java.util.Map;
+
/**
* @program: demo
* @description:
@@ -10,7 +13,24 @@
@Data
public class WsBo {
+ //当前用户id
private Integer userId;
+ //刷新时间
private int time;
+
+ //查询币种
+ private String currency;
+
+ //价差
+ private double spread = 0;
+
+ //最低金额
+ private String minAmount;
+
+ //过滤平台 逗号分割
+ private String platformList;
+
+ //需要标记的币种
+ private String isMarker;
}
diff --git a/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java b/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
index bdf64ef..ecd9266 100644
--- a/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
+++ b/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
@@ -247,7 +247,7 @@
// RedisUtil.set(key,json);
try {
// 全体发送
- wsServer.sendMessageToAll("11111111111111111111");
+ wsServer.sendMessageToAll(json);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/websocketSerivce/src/main/java/org/example/task/MarketDataTask.java b/websocketSerivce/src/main/java/org/example/task/MarketDataTask.java
index a0dfba6..29100f0 100644
--- a/websocketSerivce/src/main/java/org/example/task/MarketDataTask.java
+++ b/websocketSerivce/src/main/java/org/example/task/MarketDataTask.java
@@ -44,7 +44,7 @@
long endTime = System.nanoTime();
double durationInSeconds = (endTime - startTime) / 1_000_000_000.0;
if(durationInSeconds >= 2){
- System.out.println("程序执行时间： " + durationInSeconds + " 秒");
+ log.info("程序执行时间： " + durationInSeconds + " 秒");
}
} catch (Exception e) {
log.error("行情数据计算错误--------------【严重预警】");
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 e733091..530db1e 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,12 @@
package org.example.websocket.server;
import cn.hutool.json.JSONUtil;
+import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
+import com.google.gson.GsonBuilder;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
+import org.example.pojo.MarketDataOut;
import org.example.pojo.bo.WsBo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -18,6 +20,7 @@
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.*;
@@ -26,6 +29,7 @@
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;
@@ -95,10 +99,6 @@
if (future != null) {
future.cancel(true); // 取消定时任务
}
- ScheduledFuture<?> task = pushTasks.remove(this.session.getId());
- if (task != null) {
- task.cancel(true); // 取消推送任务
- }
}
@OnMessage
@@ -128,11 +128,7 @@
Lock sessionLock = getSessionLock(session.getId());
sessionLock.lock();
try {
- WsBo wsBo = getWsBoForSession(session.getId());
- if (wsBo != null) {
- int intervalSeconds = wsBo.getTime();
- pushMessageWithInterval(session, message, intervalSeconds);
- }
+ schedulePushMessage(session, message);
} catch (Exception e) {
log.error("发送消息时出现异常: {}", e.getMessage());
} finally {
@@ -155,30 +151,75 @@
return threadLocalData.get(sessionId);
}
- private Map<String, ScheduledFuture<?>> pushTasks = new ConcurrentHashMap<>();
- ScheduledExecutorService pushScheduler = Executors.newScheduledThreadPool(1);
+ private Map<Session, Long> lastMessageTimeMap = new ConcurrentHashMap<>();
- private void pushMessageWithInterval(Session session, String message, int intervalSeconds) {
- // 创建一个可以控制任务状态的 AtomicBoolean
- intervalSeconds = 5;
- AtomicBoolean isActive = new AtomicBoolean(true);
- ScheduledFuture<?> future = pushScheduler.scheduleAtFixedRate(() -> {
- if (isActive.get()) { // 检查是否应该继续执行
- try {
- pushMessage(session, message);
- } catch (Exception e) {
- log.error("推送消息时出现异常: {}", e.getMessage());
- isActive.set(false); // 出现异常则停止任务
- }
+ private void schedulePushMessage(Session session, String message) {
+ WsBo wsBo = getWsBoForSession(session.getId());
+ if (wsBo != null) {
+ long currentTime = System.currentTimeMillis();
+ long lastMessageTime = lastMessageTimeMap.getOrDefault(session, 0L);
+ int time = wsBo.getTime();
+ message = megFiltration(wsBo,message);
+ if (currentTime - lastMessageTime >= time * 1000) {
+ // 时间间隔达到要求，可以发送消息
+ pushMessage(session, message);
+ lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
+ } else {
+ // 时间间隔未达到，不发送消息，可以记录日志或者其他操作
+ log.info("距离上次发送消息时间未达到指定间隔，不发送消息。");
}
- }, 0, intervalSeconds, TimeUnit.SECONDS);
-
- // 保存任务的引用，以便后续取消
- pushTasks.put(session.getId(), future);
+ }
+ }
+ private static final Gson gson = new Gson();
+ private String megFiltration(WsBo wsBo,String message){
+ List<MarketDataOut> redisValueMap = gson.fromJson(message, new TypeToken<List<MarketDataOut>>() {}.getType());
+ //查询币种
+ if(null != wsBo.getCurrency()){
+ redisValueMap = redisValueMap.stream()
+ .filter(data -> wsBo.getCurrency().equals(data.getBaseAsset()))
+ .collect(Collectors.toList());
+ }
+ //价差
+ if(wsBo.getSpread() > 0){
+ redisValueMap = redisValueMap.stream()
+ .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread())
+ .collect(Collectors.toList());
+ }
+ //最低金额
+ if(null != wsBo.getMinAmount()){
+ redisValueMap = redisValueMap.stream()
+ .filter(data -> new BigDecimal(data.getSellTotalPrice()).compareTo(new BigDecimal(wsBo.getMinAmount())) >= 0 )
+ .collect(Collectors.toList());
+ }
+ //过滤平台
+ if(null != wsBo.getPlatformList()){
+ List<String> list = Arrays.asList(wsBo.getPlatformList().split(","));
+ redisValueMap = redisValueMap.stream()
+ .filter(data -> !list.contains(data.getBuyingPlatform()) && !list.contains(data.getSellPlatform()))
+ .collect(Collectors.toList());
+ }
+ //自选标记
+ if(null != wsBo.getIsMarker()){
+ List<String> list = Arrays.asList(wsBo.getIsMarker().split(","));
+ redisValueMap.stream()
+ .filter(data -> list.contains(data.getBaseAsset()))
+ .forEach(data -> data.setMarker(true));
+ }
+ Gson gson = new GsonBuilder().setPrettyPrinting().create();
+ String json = gson.toJson(redisValueMap);
+ return json;
}
- public void pushMessage(Session session, String message) throws IOException {
- session.getBasicRemote().sendText(message);
+ private void pushMessage(Session session, String message) {
+ try {
+ if (session != null && session.isOpen()) {
+ session.getBasicRemote().sendText(message);
+ } else {
+ log.error("会话不存在或已关闭，无法推送消息");
+ }
+ } catch (IOException e) {
+ log.error("推送消息时出现IO异常: {}", e.getMessage());
+ }
}
// 关闭会话的方法
--
Gitblit v1.9.3