From 8d53c609a6589158d68b5945cdb3061460a43d47 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 15 Aug 2024 04:02:17 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
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 8cf96d9..c79f29f 100644
--- a/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
+++ b/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
@@ -61,15 +61,24 @@
ExecutorService executor = Executors.newFixedThreadPool(20); // 适当增加线程数以匹配处理的交易所数量
// 异步处理每个交易所的数据
- CompletableFuture<Void> mexcFuture = CompletableFuture.runAsync(() -> processMarketData(RedisUtil.keys("mexc"), mexcList, "mexc"), executor);
- CompletableFuture<Void> gateFuture = CompletableFuture.runAsync(() -> processMarketData(RedisUtil.keys("gate"), gateList, "gate"), executor);
- CompletableFuture<Void> bitgetFuture = CompletableFuture.runAsync(() -> processMarketData(RedisUtil.keys("bitget"), bitgetList, "bitget"), executor);
- CompletableFuture<Void> kucoinFuture = CompletableFuture.runAsync(() -> processMarketData(RedisUtil.keys("kucoin"), kucoinList, "kucoin"), executor);
+ CompletableFuture<Void> mexcFuture = checkAndProcess("mexc", mexcList, executor);
+ CompletableFuture<Void> gateFuture = checkAndProcess("gate", gateList, executor);
+ CompletableFuture<Void> bitgetFuture = checkAndProcess("bitget", bitgetList, executor);
+ CompletableFuture<Void> kucoinFuture = checkAndProcess("kucoin", kucoinList, executor);
// 等待所有任务完成
CompletableFuture.allOf(mexcFuture, gateFuture, bitgetFuture, kucoinFuture).join();
executor.shutdown(); // 关闭线程池
+ }
+
+ private CompletableFuture<Void> checkAndProcess(String exchangeName, List<MarketBo> marketList, ExecutorService executor) {
+ return CompletableFuture.runAsync(() -> {
+ Set<String> keys = RedisUtil.keys(exchangeName);
+ if (keys != null && !keys.isEmpty()) {
+ processMarketData(keys, marketList, exchangeName);
+ }
+ }, executor);
}
private void processMexc() {
@@ -197,9 +206,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(() -> {
@@ -237,19 +251,27 @@
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(markets1.getExchange().toUpperCase()); // 设置买入平台
- marketDataOut.setSellPlatform(markets2.getExchange().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().toPlainString()); // 设置买入数量
- marketDataOut.setSellNumber(markets2.getAsks().getV().toPlainString()); // 设置卖出数量
- marketDataOut.setBuyTotalPrice((markets1.getBids().getP().multiply(markets1.getBids().getV())).setScale(0,RoundingMode.DOWN).toPlainString()); // 设置买入总价
- marketDataOut.setSellTotalPrice((markets2.getAsks().getP().multiply(markets2.getAsks().getV())).setScale(0,RoundingMode.DOWN).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); // 添加到输出列表
}
+
+ public static String capitalizeFirstLetter(String word) {
+ if (word == null || word.isEmpty()) {
+ return word;
+ }
+ return Character.toUpperCase(word.charAt(0)) + word.substring(1);
+ }
+
private void pushWs(List<MarketDataOut> marketDataOuts) {
// String key = "MARKET_Date";
@@ -267,17 +289,11 @@
}
public void quotationCalculation(){
- long startExtracted = System.nanoTime();
extracted();
- long endExtracted = System.nanoTime();
- double executionTimeExtracted = (endExtracted - startExtracted) / 1e9; // 转换为秒
- System.out.println("extracted 方法执行时间: " + executionTimeExtracted + " 秒");
-
- long startFindPairs = System.nanoTime();
- findProfitablePairs(mexcList, gateList, bitgetList, kucoinList); // 请确保这些变量有定义和赋值
- long endFindPairs = System.nanoTime();
- double executionTimeFindPairs = (endFindPairs - startFindPairs) / 1e9; // 转换为秒
- System.out.println("findProfitablePairs 方法执行时间: " + executionTimeFindPairs + " 秒");
+ // 检查列表是否为空并调用 findProfitablePairs 方法
+ if (!mexcList.isEmpty() || !gateList.isEmpty() || !bitgetList.isEmpty() || !kucoinList.isEmpty()) {
+ findProfitablePairs(mexcList, gateList, bitgetList, kucoinList);
+ }
}
public void scheduler(){
--
Gitblit v1.9.3