From b6597fea4558ef10c210d3d6a39761f25cdaaef6 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 10 Feb 2025 11:31:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 0c77bcf..f70a36a 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -1141,11 +1141,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         }
         // 合并分片
         String destColibPath = uploadDataDir + File.separator + currentUserId + File.separator + fileName;
-        File[] partFiles = FileUtil.ls(uploadDataDir + File.separator + currentUserId + File.separator + identifier);
-
-        for (File partFile : partFiles) {
-            try (BufferedOutputStream outputStream = FileUtil.getOutputStream(destColibPath);
-                 BufferedInputStream inputStream = FileUtil.getInputStream(partFile)) {
+        String path = uploadDataDir + File.separator + currentUserId + File.separator + identifier;
+        BufferedOutputStream outputStream = FileUtil.getOutputStream(destColibPath);
+        for (int i = 1; i <= totalChunks; i++) {
+            try (BufferedInputStream inputStream = FileUtil.getInputStream(path + File.separator + i + UPLOAD_FILE_CHUNK_SUFFIX)) {
                 IoUtil.copy(inputStream, outputStream);
             } catch (Exception e) {
                 FileUtil.del(destColibPath);
@@ -1154,7 +1153,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 throw new BizException(info);
             }
         }
-        Arrays.stream(partFiles).forEach(e -> FileUtil.del(e.getAbsolutePath()));
+        Arrays.stream(FileUtil.ls(path)).forEach(e -> FileUtil.del(e.getAbsolutePath()));
         return destColibPath;
     }