From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/service/ZipAndRarService.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/service/ZipAndRarService.java b/src/main/java/com/whyc/service/ZipAndRarService.java
index 6862c25..cd140b3 100644
--- a/src/main/java/com/whyc/service/ZipAndRarService.java
+++ b/src/main/java/com/whyc/service/ZipAndRarService.java
@@ -5,9 +5,9 @@
import com.whyc.pojo.FileMessage;
import com.whyc.util.FileUtil;
import com.whyc.util.ZipAndRarUtil;
+import org.apache.commons.compress.archivers.ArchiveException;
import org.springframework.stereotype.Service;
-import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -34,21 +34,19 @@
return new Response().setII(1,list!=null,list,"鍘嬬缉鏂囦欢淇℃伅");
}
- public Response decompress(String compressedFileUrl) {
+ public Response decompress(String compressedFileUrl) throws ArchiveException, IOException, InterruptedException {
String fileSuffix = (compressedFileUrl.substring(compressedFileUrl.lastIndexOf(".")+1));
- if(compressedFileUrl.endsWith("zip")) {
-
-
- }
- else if(compressedFileUrl.endsWith("rar")){
-
+ List<String> resList = new LinkedList<>();
+ if(fileSuffix.equals("zip")||fileSuffix.equals("rar")) {
+ List<String> decompressList = FileUtil.decompress(compressedFileUrl);
+ for (String decompress : decompressList) {
+ resList.add(decompress.substring(decompress.indexOf("doc_file")));
+ }
}else{
return new Response().set(1,false,fileSuffix+"绫诲瀷鍘嬬缉鍖呮殏涓嶆敮鎸佽В鍘�");
}
- File decompressedPath = new File("");
- LinkedList fileList = new LinkedList<String>();
- FileUtil.getStaticFilePath(decompressedPath,fileList);
- return new Response().setII(1,true,fileList,null);
+
+ return new Response().setII(1,true, resList,null);
}
}
--
Gitblit v1.9.1