From d2ba7ed50955701234b1b50ceaf04fe36b86c61d Mon Sep 17 00:00:00 2001 From: whycxzp <glperry@163.com> Date: 星期三, 03 一月 2024 15:19:16 +0800 Subject: [PATCH] 更新解压 --- src/main/java/com/whyc/service/ZipAndRarService.java | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/whyc/service/ZipAndRarService.java b/src/main/java/com/whyc/service/ZipAndRarService.java index 0a16861..7727369 100644 --- a/src/main/java/com/whyc/service/ZipAndRarService.java +++ b/src/main/java/com/whyc/service/ZipAndRarService.java @@ -3,6 +3,7 @@ import com.whyc.dto.FileDirPath; import com.whyc.dto.Response; import com.whyc.pojo.FileMessage; +import com.whyc.util.FileUtil; import com.whyc.util.ZipAndRarUtil; import org.springframework.stereotype.Service; @@ -34,22 +35,17 @@ public Response decompress(String compressedFileUrl) { String fileSuffix = (compressedFileUrl.substring(compressedFileUrl.lastIndexOf(".")+1)); - if(fileSuffix.equals("zip")) { - - - } - else if(compressedFileUrl.equals("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+"绫诲瀷鍘嬬缉鍖呮殏涓嶆敮鎸佽В鍘�"); } - LinkedList fileList = new LinkedList<String>(); - //File decompressedPath = new File(""); - //FileUtil.getStaticFilePath(decompressedPath,fileList); - fileList.add("doc_file\\material\\1059-0102001393-C19P-N-001_A01\\1.png"); - fileList.add("doc_file\\material\\1059-0102001393-C19P-N-001_A01\\2.dwg"); - fileList.add("doc_file\\material\\1059-0102001393-C19P-N-001_A01\\dwg\\2.dwg"); - return new Response().setII(1,true,fileList,null); + + return new Response().setII(1,true, resList,null); } } -- Gitblit v1.9.1