From 696f4d3a8892e1d0807cf1f5fd37ae4e818b63d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Tue, 10 Sep 2024 14:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=BA=BF=E7=A8=8B=E6=95=88?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quest/service/impl/TaskServiceImpl.java   | 30 ++++++++-----------
 .../java/com/muyu/quest/utils/NodeUtils.java  |  3 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java
index db8351f..176496b 100644
--- a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java
+++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java
@@ -157,16 +157,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
         String findSql = getFindSql(nodeMap);
         // 获取查询条数
         int count = getFindCount(findSql, nodeMap);
-        // 划分线程 每次根据条数分配线程每次查询条数
-        // 总条数 最大线程数/分配条数 >100W 5/100000  >10W 8/10000  <10W 8/1000
-        int pageSize = 10000;
+        // 划分线程
+        int pageSize = 30000;
         int taskNum = 8;
-//        if (count > 8000000){
-//            pageSize = 100000;
-//            taskNum = 5;
-//        }else if (count < 100000){
-//            pageSize = 1000;
-//        }
         int threadNum = count / pageSize + 1;
         log.info("任务 {} 总共需要 {} 条数据, 划分为线程{}条",taskCode,count,threadNum);
         // 如果线程池未创建 => 创建, 如果已完成内部任务 => 清理后创建新线程池
@@ -178,21 +171,20 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
         }
         for (int i = 0; i < threadNum; i++) {
             int index = i+1;
-            int limitNum = pageSize;
             // 添加进入任务队列
             taskManager.execute(() -> {
+                long startTime = System.currentTimeMillis();
                 String exportCode = UUID.randomUUID().toString().replace("-","");
                 // 获取新SQL 并执行
                 StringBuilder newFindSql = new StringBuilder(findSql);
                 newFindSql.append(" LIMIT ")
-                        .append(limitNum)
+                        .append(pageSize)
                         .append(" OFFSET ")
-                        .append((index-1)*limitNum);
+                        .append((index-1) * pageSize);
                 String addSql = getAddSql(nodeMap, newFindSql.toString());
                 TaskExport entity = new TaskExport(taskCode,exportCode, newFindSql.toString(), 0, "");
                 taskExportService.save(entity);
                 Result addResult = remoteDataSourceService.addTableValue(new DataValueModel(4L, addSql));
-                log.info("任务 {} 第 {} 线程执行结果 {}",taskCode,index,addResult.getMsg());
                 if (addResult.getCode() != 200){
                     int errorMaxLength = Math.min(addResult.getMsg().length(), 30000);
                     entity.setError(addResult.getMsg().substring(0,errorMaxLength));
@@ -201,12 +193,16 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>
                     entity.setStart(1);
                 }
                 taskExportService.updateByExportCode(entity);
+                log.info("第 {} 线程执行结果 {},耗时: {}ms",index,addResult.getMsg(),System.currentTimeMillis()-startTime);
+                if (index == threadNum){
+                    new Thread(() -> {
+                        taskManager.closed();
+                        taskManager = null;
+                    }).start();
+                }
             });
         }
-        new Thread(() -> {
-            taskManager.closed();
-            taskManager = null;
-        }).start();
+
         return "任务启动成功!";
     }
 
diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java b/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java
index da94cef..46bcacb 100644
--- a/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java
+++ b/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java
@@ -345,7 +345,8 @@ public class NodeUtils {
                     .replace("'","")
                     .replace("`","")
                     .replace(" ","")
-                    .replace("\\",""));
+                    .replace("\\","")
+            );
         }
         return data;
     }