From cd95c9114fcbb3fc65c666b8b86c378f9a96d55b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 12 Nov 2024 23:08:02 +0800
Subject: [PATCH] 1
---
geteClient/src/main/java/org/example/geteclient/WsBean/GateWsBean.java | 2 +-
websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java | 32 ++++++++++++++++++--------------
bitgetsClient/src/main/java/org/example/bitgetsclient/WsBean/BitgetsWsBean.java | 2 +-
mexcClient/src/main/java/org/example/mexcclient/WsBean/MexcWsBean.java | 2 +-
kucoinClient/src/main/java/org/example/kucoinclient/WsBean/KucoinWsBean.java | 2 +-
5 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/bitgetsClient/src/main/java/org/example/bitgetsclient/WsBean/BitgetsWsBean.java b/bitgetsClient/src/main/java/org/example/bitgetsclient/WsBean/BitgetsWsBean.java
index 40ad1f2..84137ad 100644
--- a/bitgetsClient/src/main/java/org/example/bitgetsclient/WsBean/BitgetsWsBean.java
+++ b/bitgetsClient/src/main/java/org/example/bitgetsclient/WsBean/BitgetsWsBean.java
@@ -43,7 +43,7 @@
@Bean
public void bitgetWebsocketRunClientMap() throws JSONException, JsonProcessingException {
- List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "bitget"));
+ List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "bitget").eq(Currency::getQuoteAsset,"USDT"));
if (!CollectionUtils.isEmpty(mexc)) {
int batchSize = 100; // 每个线程处理的数据量
int totalSize = mexc.size();
diff --git a/geteClient/src/main/java/org/example/geteclient/WsBean/GateWsBean.java b/geteClient/src/main/java/org/example/geteclient/WsBean/GateWsBean.java
index 1fc5d4a..2f697ca 100644
--- a/geteClient/src/main/java/org/example/geteclient/WsBean/GateWsBean.java
+++ b/geteClient/src/main/java/org/example/geteclient/WsBean/GateWsBean.java
@@ -35,7 +35,7 @@
@Bean
public void gateWebsocketRunClientMap() {
- List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "gate"));
+ List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "gate").eq(Currency::getQuoteAsset,"USDT"));
if (!CollectionUtils.isEmpty(mexc)) {
int batchSize = 100; // 每个线程处理的数据量
int totalSize = mexc.size();
diff --git a/kucoinClient/src/main/java/org/example/kucoinclient/WsBean/KucoinWsBean.java b/kucoinClient/src/main/java/org/example/kucoinclient/WsBean/KucoinWsBean.java
index 9399a58..906eef6 100644
--- a/kucoinClient/src/main/java/org/example/kucoinclient/WsBean/KucoinWsBean.java
+++ b/kucoinClient/src/main/java/org/example/kucoinclient/WsBean/KucoinWsBean.java
@@ -44,7 +44,7 @@
@Bean
public void kucoinWebsocketRunClientMap() throws Exception {
- List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "kucoin"));
+ List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "kucoin").eq(Currency::getQuoteAsset,"USDT"));
if (!CollectionUtils.isEmpty(mexc)) {
String result = doPost();
JSONObject jsonObject = new JSONObject(result);
diff --git a/mexcClient/src/main/java/org/example/mexcclient/WsBean/MexcWsBean.java b/mexcClient/src/main/java/org/example/mexcclient/WsBean/MexcWsBean.java
index dd8c456..c4a249f 100644
--- a/mexcClient/src/main/java/org/example/mexcclient/WsBean/MexcWsBean.java
+++ b/mexcClient/src/main/java/org/example/mexcclient/WsBean/MexcWsBean.java
@@ -53,7 +53,7 @@
@Bean
public void mexcWebsocketRunClientMap() throws InterruptedException {
- List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "mexc"));
+ List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "mexc").eq(Currency::getQuoteAsset,"USDT"));
if (!CollectionUtils.isEmpty(mexc)) {
int batchSize = 30; // 每个线程处理的数据量
int totalSize = mexc.size();
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 c79f29f..a2d7e16 100644
--- a/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
+++ b/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
@@ -249,20 +249,24 @@
}
private static void assembleMarketDataOut(String coinName, MarketBo markets1, MarketBo markets2, BigDecimal profitPercentage, BigDecimal buyPrice, BigDecimal sellPrice, List<MarketDataOut> marketDataOuts, String formattedDateTime) {
- MarketDataOut marketDataOut = new MarketDataOut();
- marketDataOut.setBaseAsset(coinName.replaceAll("USDT","").toLowerCase().toUpperCase()); // 设置基础资产
- marketDataOut.setBuyingPlatform(capitalizeFirstLetter(markets1.getExchange())); // 设置买入平台，首字母大写
- marketDataOut.setSellPlatform(capitalizeFirstLetter(markets2.getExchange())); // 设置卖出平台，首字母大写
- marketDataOut.setSpread(profitPercentage.setScale(4, RoundingMode.DOWN).toPlainString()); // 设置利润百分比
- marketDataOut.setBuyPrice(buyPrice.toPlainString()); // 设置买入价格
- marketDataOut.setSellPrice(sellPrice.toPlainString()); // 设置卖出价格
- marketDataOut.setBuyNumber(markets1.getBids().getV().setScale(4, RoundingMode.HALF_UP).toPlainString()); // 设置买入数量
- marketDataOut.setSellNumber(markets2.getAsks().getV().setScale(4, RoundingMode.HALF_UP).toPlainString()); // 设置卖出数量
- marketDataOut.setBuyTotalPrice((markets1.getBids().getP().multiply(markets1.getBids().getV())).setScale(0, RoundingMode.HALF_UP).toPlainString()); // 设置买入总价
- marketDataOut.setSellTotalPrice((markets2.getAsks().getP().multiply(markets2.getAsks().getV())).setScale(0,RoundingMode.HALF_UP).toPlainString()); // 设置卖出总价
- marketDataOut.setServceTime(formattedDateTime); // 设置服务时间
- marketDataOut.setBuyAndSell(marketDataOut.getBaseAsset()+marketDataOut.getBuyingPlatform()+marketDataOut.getSellPlatform());
- marketDataOuts.add(marketDataOut); // 添加到输出列表
+ if(coinName.contains(String.valueOf("USDT"))){
+ MarketDataOut marketDataOut = new MarketDataOut();
+ marketDataOut.setBaseAsset(coinName.replaceAll("USDT","").toLowerCase().toUpperCase()); // 设置基础资产
+ marketDataOut.setBuyingPlatform(capitalizeFirstLetter(markets1.getExchange())); // 设置买入平台，首字母大写
+ marketDataOut.setSellPlatform(capitalizeFirstLetter(markets2.getExchange())); // 设置卖出平台，首字母大写
+ marketDataOut.setSpread(profitPercentage.setScale(4, RoundingMode.DOWN).toPlainString()); // 设置利润百分比
+ marketDataOut.setBuyPrice(buyPrice.toPlainString()); // 设置买入价格
+ marketDataOut.setSellPrice(sellPrice.toPlainString()); // 设置卖出价格
+ marketDataOut.setBuyNumber(markets1.getBids().getV().setScale(4, RoundingMode.HALF_UP).toPlainString()); // 设置买入数量
+ marketDataOut.setSellNumber(markets2.getAsks().getV().setScale(4, RoundingMode.HALF_UP).toPlainString()); // 设置卖出数量
+ marketDataOut.setBuyTotalPrice((markets1.getBids().getP().multiply(markets1.getBids().getV())).setScale(0, RoundingMode.HALF_UP).toPlainString()); // 设置买入总价
+ marketDataOut.setSellTotalPrice((markets2.getAsks().getP().multiply(markets2.getAsks().getV())).setScale(0,RoundingMode.HALF_UP).toPlainString()); // 设置卖出总价
+ marketDataOut.setServceTime(formattedDateTime); // 设置服务时间
+ marketDataOut.setBuyAndSell(marketDataOut.getBaseAsset()+marketDataOut.getBuyingPlatform()+marketDataOut.getSellPlatform());
+ marketDataOuts.add(marketDataOut); // 添加到输出列表
+ }else{
+ System.out.println(coinName);
+ }
}
public static String capitalizeFirstLetter(String word) {
--
Gitblit v1.9.3