修改导出pdf优化

master
hcy 2 years ago
parent 3acc7161fe
commit 6a3dade53b

@ -1083,10 +1083,10 @@ public class CommomService {
if (commomVo != null && StringUtils.isNotBlank(commomVo.getFilePath())) { if (commomVo != null && StringUtils.isNotBlank(commomVo.getFilePath())) {
File filePath = new File(commomVo.getFilePath()); /*File filePath = new File(commomVo.getFilePath());
if (!filePath.exists()) { if (!filePath.exists()) {
filePath.mkdirs(); filePath.mkdirs();
} }*/
//pdf转jpg图片生成到指定路徑 //pdf转jpg图片生成到指定路徑
List<String> picNameList = Pdf2ImgUtil.pdfToPic(saveFileName, pdfName, "jpg", commomVo.getFilePath()); List<String> picNameList = Pdf2ImgUtil.pdfToPic(saveFileName, pdfName, "jpg", commomVo.getFilePath());
@ -1114,10 +1114,9 @@ public class CommomService {
//创建生成excel //创建生成excel
excelEntity = ImportExcelUtil.getExcle(exportInpVoList); excelEntity = ImportExcelUtil.getExcle(exportInpVoList);
} }
FileUtils.deleteDirectory(new File(saveFileName)); //FileUtils.deleteDirectory(new File(saveFileName));
return ResultUtil.ok(excelEntity); return ResultUtil.ok(excelEntity);
} else { } else {
//FileUtils.deleteDirectory(new File(saveFileName));
return ResultUtil.error("pdf文件不存在"); return ResultUtil.error("pdf文件不存在");
} }

@ -7,6 +7,7 @@ import java.io.*;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
/** /**
@ -37,7 +38,7 @@ public class CompressFileUtils {
if (!pathFile.exists()) { if (!pathFile.exists()) {
pathFile.mkdirs(); pathFile.mkdirs();
} }
ZipFile zip = new ZipFile(zipFile,Charset.forName("GBK")); try(ZipFile zip = new ZipFile(zipFile,Charset.forName("GBK"))) {
for (Enumeration entries = zip.entries(); entries.hasMoreElements(); ) { for (Enumeration entries = zip.entries(); entries.hasMoreElements(); ) {
ZipEntry entry = (ZipEntry) entries.nextElement(); ZipEntry entry = (ZipEntry) entries.nextElement();
String zipEntryName = entry.getName(); String zipEntryName = entry.getName();
@ -65,6 +66,10 @@ public class CompressFileUtils {
in.close(); in.close();
out.close(); out.close();
} }
} catch (ZipException e) {
// 特定的Zip文件异常处理
e.printStackTrace();
}
//System.out.println("******************解压完毕********************"); //System.out.println("******************解压完毕********************");
} }

Loading…
Cancel
Save