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 |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 2b3ae92..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() {
@@ -281,7 +290,10 @@
 
     public void quotationCalculation(){
         extracted();
-        findProfitablePairs(mexcList, gateList, bitgetList, kucoinList); // 请确保这些变量有定义和赋值
+        // 检查列表是否为空并调用 findProfitablePairs 方法
+        if (!mexcList.isEmpty() || !gateList.isEmpty() || !bitgetList.isEmpty() || !kucoinList.isEmpty()) {
+            findProfitablePairs(mexcList, gateList, bitgetList, kucoinList);
+        }
     }
 
     public void scheduler(){

--
Gitblit v1.9.3