From a67c6f45a926165cb9872a9b59e631b1b38b4617 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Tue, 18 Jun 2024 14:23:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E4=B8=80=E7=99=BE=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=81=9A=E6=96=B0=E5=A2=9E=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GetInformationForExcelServiceImpl.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
index 44dd81f0..654b9b9a 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
@@ -74,7 +74,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
     private void saveInformation(EquipmentFolderLocation excel) throws Exception {
         String folderFiler = excel.getFolderPath();
         //获取文件夹下所有文件
-//        List<File> files = getExcelFiles(folderFiler);
         //创建本地文件夹路径
         File fileInfo = new File(folderFiler);
         //获取本地文件夹下所有文件
@@ -114,7 +113,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                                 imageFiles.add(file.getFileName().toString());
 
                             } else {
-                                String timestamp = String.valueOf(System.currentTimeMillis());
+//                                String timestamp = String.valueOf(System.currentTimeMillis());
                                 // 指定新的文件名（这里示例加上前缀）
 //                                Path newFilePath = folderPath.resolve(timestamp + "$" + file.getFileName());
 //                                // 重命名文件
@@ -474,15 +473,20 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     endList = equipmentDataDetails.size();
                 }
                 List<EquipmentDataDetail> details = equipmentDataDetails.subList(startList, endList);
-                startList = startList + endList;
-                endList = endList + endList;
                 executor.execute(() -> {
                     //批量新增
                     getInformationForExcelMapper.saveByExcels(details);
                 });
+                startList = startList + 100;
+                endList = endList + 100;
             }
-            // 关闭线程池
             executor.shutdown();
+            try {
+                executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); // 等待所有任务完成
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                // 处理中断异常
+            }
         }
     }