From f6bd6d0ad7b21ed124afca7c30c8fcea93a56319 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 07 Aug 2024 18:35:34 +0800
Subject: [PATCH] 1

---
 geteClient/src/main/java/org/example/geteclient/task/RunTask.java              |    2 +-
 kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java |    6 +++++-
 kucoinClient/src/main/java/org/example/kucoinclient/task/RunTask.java          |    2 +-
 mexcClient/src/main/java/org/example/mexcclient/task/RunTask.java              |    2 +-
 mexcClient/src/main/java/org/example/mexcclient/WsBean/MexcWsBean.java         |   10 +++++++---
 bitgetsClient/src/main/java/org/example/bitgetsclient/task/RunTask.java        |    2 +-
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/bitgetsClient/src/main/java/org/example/bitgetsclient/task/RunTask.java b/bitgetsClient/src/main/java/org/example/bitgetsclient/task/RunTask.java
index 25b7c0a..364222a 100644
--- a/bitgetsClient/src/main/java/org/example/bitgetsclient/task/RunTask.java
+++ b/bitgetsClient/src/main/java/org/example/bitgetsclient/task/RunTask.java
@@ -29,7 +29,7 @@
     @Qualifier("threadPoolTaskExecutor")
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
-    @Scheduled(cron = "0 0/11 * * * ?")
+//    @Scheduled(cron = "0 0/11 * * * ?")
     public void restart() {
         // 停止当前线程池中的任务
         threadPoolTaskExecutor.shutdown();
diff --git a/geteClient/src/main/java/org/example/geteclient/task/RunTask.java b/geteClient/src/main/java/org/example/geteclient/task/RunTask.java
index 6ea5561..949a993 100644
--- a/geteClient/src/main/java/org/example/geteclient/task/RunTask.java
+++ b/geteClient/src/main/java/org/example/geteclient/task/RunTask.java
@@ -26,7 +26,7 @@
     @Qualifier("threadPoolTaskExecutor")
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
-    @Scheduled(cron = "0 0/11 * * * ?")
+//    @Scheduled(cron = "0 0/11 * * * ?")
     public void restart() {
         // 停止当前线程池中的任务
         threadPoolTaskExecutor.shutdown();
diff --git a/kucoinClient/src/main/java/org/example/kucoinclient/task/RunTask.java b/kucoinClient/src/main/java/org/example/kucoinclient/task/RunTask.java
index a3c686e..e48395f 100644
--- a/kucoinClient/src/main/java/org/example/kucoinclient/task/RunTask.java
+++ b/kucoinClient/src/main/java/org/example/kucoinclient/task/RunTask.java
@@ -26,7 +26,7 @@
     @Qualifier("threadPoolTaskExecutor")
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
-    @Scheduled(cron = "0 0/1 * * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ?")
     public void restart() {
         // 停止当前线程池中的任务
         threadPoolTaskExecutor.shutdown();
diff --git a/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java b/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
index 58f6eda..90b3d5c 100644
--- a/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
+++ b/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
@@ -129,7 +129,11 @@
         }
         if (map.get("data") != null) {
             Object object = map.get("data"); // 获取数据内容
-            processData(map.get("topic").toString(), object); // 处理数据
+            if(null == map.get("topic")){
+                System.out.println("-------------------出错了:"+map);
+            }else{
+                processData(map.get("topic").toString(), object); // 处理数据
+            }
         }
     }
 
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 0340831..dd8c456 100644
--- a/mexcClient/src/main/java/org/example/mexcclient/WsBean/MexcWsBean.java
+++ b/mexcClient/src/main/java/org/example/mexcclient/WsBean/MexcWsBean.java
@@ -52,18 +52,22 @@
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     @Bean
-    public void mexcWebsocketRunClientMap() {
+    public void mexcWebsocketRunClientMap() throws InterruptedException {
         List<Currency> mexc = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "mexc"));
         if (!CollectionUtils.isEmpty(mexc)) {
             int batchSize = 30; // 每个线程处理的数据量
             int totalSize = mexc.size();
             int threadCount = (int) Math.ceil((double) totalSize / batchSize); // 计算需要的线程数
-
+            int count = 0;
             for (int i = 0; i < threadCount; i++) {
                 int fromIndex = i * batchSize;
                 int toIndex = Math.min(fromIndex + batchSize, totalSize);
                 List<Currency> sublist = mexc.subList(fromIndex, toIndex);
-
+                count++;
+                if(count % 15 == 0 && count != 0){
+                    count = 0;
+                    Thread.sleep(1500);
+                }
                 // 使用自定义线程池提交任务
                 threadPoolTaskExecutor.execute(() -> {
                     new MexcClient(sublist).start();
diff --git a/mexcClient/src/main/java/org/example/mexcclient/task/RunTask.java b/mexcClient/src/main/java/org/example/mexcclient/task/RunTask.java
index 5febd82..31cf42c 100644
--- a/mexcClient/src/main/java/org/example/mexcclient/task/RunTask.java
+++ b/mexcClient/src/main/java/org/example/mexcclient/task/RunTask.java
@@ -26,7 +26,7 @@
     @Qualifier("threadPoolTaskExecutor")
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
-    @Scheduled(cron = "0 0/11 * * * ?")
+//    @Scheduled(cron = "0 0/11 * * * ?")
     public void restart() {
         // 停止当前线程池中的任务
         threadPoolTaskExecutor.shutdown();

--
Gitblit v1.9.3