fix:分卷压缩包解压支持

mo-daq/src/main/java/com/smppw/modaq/domain/service/EmailParseService.java

@@ -712,10 +712,9 @@ public class EmailParseService {
             return;
         }
 
-        String emailDate = DateUtil.format(sendDate, DateConst.YYYYMMDDHHMMSS24);
         String emailDateStr = DateUtil.format(sendDate, DateConst.YYYYMMDD);
         String filePath = path + File.separator + account + File.separator + emailDateStr + File.separator;
-        File saveFile = FileUtil.file(filePath + emailDate + fileName);
+        File saveFile = FileUtil.file(filePath + fileName);
         if (!saveFile.exists()) {
             if (!saveFile.getParentFile().exists()) {
                 boolean mkdirs = saveFile.getParentFile().mkdirs();

mo-daq/src/main/java/com/smppw/modaq/infrastructure/util/ZipUtil.java

@@ -60,16 +60,16 @@ public class ZipUtil {
             return;
         }
 
-        // 2. 创建当前 ZIP 的解压目录
+        // 2. 创建当前 ZIP 的解压目录（跟压缩包目录已经处理过，就不要追加到文件目录中了）
         String currentZipName = FileUtil.mainName(currentZip);
         String currentNestedPath = nestedPath.isEmpty()
-                ? currentZipName
+                ? ""
                 : nestedPath + File.separator + currentZipName;
         File currentOutputDir = new File(rootOutputDir, currentNestedPath);
         FileUtil.mkdir(currentOutputDir);
 
-        // 3. 解压当前 ZIP
-        try (ZipFile zip = ZipFile.builder().setFile(currentZip).setCharset(encoding).get()) {
+        // 3. 解压当前 ZIP，支持最多10个分卷的解压
+        try (ZipFile zip = ZipFile.builder().setFile(currentZip).setCharset(encoding).setMaxNumberOfDisks(10).get()) {
             Enumeration<ZipArchiveEntry> entries = zip.getEntries();
 
             while (entries.hasMoreElements()) {
@@ -109,8 +109,7 @@ public class ZipUtil {
                     Files.delete(nestedZipFile.toPath());
                 } else {
                     // 记录路径
-                    String relativePath = rootOutputDir + File.separator + currentNestedPath + File.separator + name;
-                    decompressedFiles.add(relativePath);
+                    decompressedFiles.add(entryPath.toString());
                 }
             }
         }
@@ -125,12 +124,17 @@ public class ZipUtil {
 
     // 使用示例
     public static void main(String[] args) throws Exception {
-        List<String> files = decompressZip(
-                new File("C:\\Users\\Administrator\\Desktop\\上海熙盛明诚私募基金管理有限公司-信披报告.zip"),
-                new File("C:\\Users\\Administrator\\Desktop"),
-                2,
-                "UTF-8"
-        );
+//        List<String> files = decompressZip(
+//                new File("C:\\Users\\Administrator\\Desktop\\上海熙盛明诚私募基金管理有限公司-信披报告.zip"),
+//                new File("C:\\Users\\Administrator\\Desktop"),
+//                2,
+//                "UTF-8"
+//        );
+//        System.out.println("解压后的文件路径:");
+//        files.forEach(System.out::println);
+
+        String currentZip = "D:\\Documents\\新报告解析\\确认单\\20250514_份额及交易确认函_上海量魁私募基金管理有限公司_深圳市前海排排网基金销售有限责任公司_TA确认数据.zip";
+        List<String> files = decompressZip(currentZip, "D:\\Documents\\新报告解析\\确认单\\", 2, "utf-8");
         System.out.println("解压后的文件路径:");
         files.forEach(System.out::println);
     }

mo-daq/src/test/java/com/smppw/modaq/MoDaqApplicationTests.java

@@ -37,9 +37,9 @@ public class MoDaqApplicationTests {
 
     @Test
     public void reportTest() {
-        MailboxInfoDTO emailInfoDTO = this.buildMailbox("**@simuwang.com", "**");
-        Date startDate = DateUtil.parse("2025-05-22 15:23:00", DateConst.YYYY_MM_DD_HH_MM_SS);
-        Date endDate = DateUtil.parse("2025-05-22 15:58:00", DateConst.YYYY_MM_DD_HH_MM_SS);
+        MailboxInfoDTO emailInfoDTO = this.buildMailbox("**@simuwang.com", "***");
+        Date startDate = DateUtil.parse("2025-05-16 11:23:00", DateConst.YYYY_MM_DD_HH_MM_SS);
+        Date endDate = DateUtil.parse("2025-05-24 15:58:00", DateConst.YYYY_MM_DD_HH_MM_SS);
         try {
             List<String> folderNames = ListUtil.list(false);
 //            folderNames.add("其他文件夹/报告公告");