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/server/impl/CurrencySerivceImpl.java | 7 ++++++-
websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java | 13 ++++++++++---
websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java | 2 ++
3 files changed, 18 insertions(+), 4 deletions(-)
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 99295dc..aa4a917 100644
--- a/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
+++ b/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
@@ -42,6 +42,8 @@
private String uuid;
+ private Boolean systemFiltration = false;
+
//当前页
private Integer current = 1;
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 070a357..2b3ae92 100644
--- a/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
+++ b/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
@@ -197,9 +197,14 @@
if (markets1.getBids() == null) continue;
for (int j = 0; j < exchanges.length; j++) {
- if (i == j) continue;
+
MarketBo markets2 = exchangeMap.get(exchanges[j]);
+
+ if(markets1.getExchange().equals(markets2.getExchange())){
+ continue;
+ }
+
if (markets2.getAsks() == null) continue;
CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
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 d100a29..a4494e3 100644
--- a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
+++ b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
@@ -245,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()
--
Gitblit v1.9.3