From 38cb2d157ac6635bcbfc0b2609067b17dee06700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com>
Date: Sun, 8 Sep 2024 10:22:59 +0800
Subject: [PATCH] =?UTF-8?q?09081022:=E7=BB=99=E4=BB=BB=E5=8A=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=8F=90=E4=BE=9B=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/Impl/DataValueServiceImpl.java    | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java
index 9c7bff6..1dd2518 100644
--- a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java
+++ b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataValueServiceImpl.java
@@ -351,21 +351,30 @@ public class DataValueServiceImpl extends ServiceImpl<DataValueMapper, DataValue
         MysqlQuery mysqlQuery = new MysqlQuery();
         mysqlQuery.setDataSourceId(dataValueModel.getBasicId());
         DataSource dataSource = dataSourceService.getById(dataValueModel.getBasicId());
-
         MysqlPool mysqlPool = new MysqlPool(dataSource);
         mysqlPool.init();
+        // 创建线程池
         ExecutorService executorService1 = Executors.newFixedThreadPool(8);
+        // 用于记录批量插入的数量
         AtomicInteger atomicInteger = new AtomicInteger();
+        // 将数据拆分成小批量
         List<DataValue[][]> batches =splitData(dataValueModel.getDataValues(),2000);
+        // 获取连接
         Connection conn = mysqlPool.getConn();
 
         try {
+            // 关闭自动提交,改为手动提交
             conn.setAutoCommit(false);
+            // 提交数据
             for (DataValue[][] batch : batches) {
+                // 异步提交数据
                 executorService1.submit(()->{
                     try {
+                        // 创建语句
                         Statement statement = conn.createStatement();
-                        statement.executeQuery(dataValueModel.getSql());
+                        // 执行语句
+                        statement.executeUpdate(dataValueModel.getSql());
+
                         atomicInteger.addAndGet(batch.length);
                     } catch (SQLException e) {
                         try {
@@ -378,9 +387,11 @@ public class DataValueServiceImpl extends ServiceImpl<DataValueMapper, DataValue
                     }
                 });
             }
+            // 等待所有任务完成
             executorService1.shutdown();
+            // 等待所有任务完成
             executorService1.awaitTermination(1, TimeUnit.MINUTES);
-
+            // 提交事务
             conn.commit();
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -388,10 +399,13 @@ public class DataValueServiceImpl extends ServiceImpl<DataValueMapper, DataValue
         } catch (SQLException e) {
             throw new RuntimeException(e);
         } finally {
+            // 关闭连接
             mysqlPool.closeConn();
+            // 关闭连接池
             mysqlPool.closeBaseConn();
+            // 关闭线程池
+            executorService1.shutdownNow();
         }
-
         return atomicInteger.get();
     }