diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index ae10872..4ebf9a6 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -1083,10 +1083,10 @@ public class CommomService { if (commomVo != null && StringUtils.isNotBlank(commomVo.getFilePath())) { - File filePath = new File(commomVo.getFilePath()); + /*File filePath = new File(commomVo.getFilePath()); if (!filePath.exists()) { filePath.mkdirs(); - } + }*/ //pdf转jpg图片生成到指定路徑 List picNameList = Pdf2ImgUtil.pdfToPic(saveFileName, pdfName, "jpg", commomVo.getFilePath()); @@ -1114,10 +1114,9 @@ public class CommomService { //创建生成excel excelEntity = ImportExcelUtil.getExcle(exportInpVoList); } - FileUtils.deleteDirectory(new File(saveFileName)); + //FileUtils.deleteDirectory(new File(saveFileName)); return ResultUtil.ok(excelEntity); } else { - //FileUtils.deleteDirectory(new File(saveFileName)); return ResultUtil.error("pdf文件不存在"); } diff --git a/src/main/java/com/emr/util/CompressFileUtils.java b/src/main/java/com/emr/util/CompressFileUtils.java index d5df37e..7e4eb25 100644 --- a/src/main/java/com/emr/util/CompressFileUtils.java +++ b/src/main/java/com/emr/util/CompressFileUtils.java @@ -7,6 +7,7 @@ import java.io.*; import java.nio.charset.Charset; import java.util.Enumeration; import java.util.zip.ZipEntry; +import java.util.zip.ZipException; import java.util.zip.ZipFile; /** @@ -37,33 +38,37 @@ public class CompressFileUtils { if (!pathFile.exists()) { pathFile.mkdirs(); } - ZipFile zip = new ZipFile(zipFile,Charset.forName("GBK")); - for (Enumeration entries = zip.entries(); entries.hasMoreElements(); ) { - ZipEntry entry = (ZipEntry) entries.nextElement(); - String zipEntryName = entry.getName(); - InputStream in = zip.getInputStream(entry); - String outPath = (descDir + zipEntryName).replaceAll("\\*", "/"); - ; - //判断路径是否存在,不存在则创建文件路径 - File file = new File(outPath.substring(0, outPath.lastIndexOf('/'))); - if (!file.exists()) { - file.mkdirs(); - } - //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压 - if (new File(outPath).isDirectory()) { - continue; - } - //输出文件路径信息 - //System.out.println(outPath); + try(ZipFile zip = new ZipFile(zipFile,Charset.forName("GBK"))) { + for (Enumeration entries = zip.entries(); entries.hasMoreElements(); ) { + ZipEntry entry = (ZipEntry) entries.nextElement(); + String zipEntryName = entry.getName(); + InputStream in = zip.getInputStream(entry); + String outPath = (descDir + zipEntryName).replaceAll("\\*", "/"); + ; + //判断路径是否存在,不存在则创建文件路径 + File file = new File(outPath.substring(0, outPath.lastIndexOf('/'))); + if (!file.exists()) { + file.mkdirs(); + } + //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压 + if (new File(outPath).isDirectory()) { + continue; + } + //输出文件路径信息 + //System.out.println(outPath); - OutputStream out = new FileOutputStream(outPath); - byte[] buf1 = new byte[1024]; - int len; - while ((len = in.read(buf1)) > 0) { - out.write(buf1, 0, len); + OutputStream out = new FileOutputStream(outPath); + byte[] buf1 = new byte[1024]; + int len; + while ((len = in.read(buf1)) > 0) { + out.write(buf1, 0, len); + } + in.close(); + out.close(); } - in.close(); - out.close(); + } catch (ZipException e) { + // 特定的Zip文件异常处理 + e.printStackTrace(); } //System.out.println("******************解压完毕********************"); }