From c6d5a3e6711e58546254333aa1184360a841c6bb Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期一, 12 六月 2023 11:07:53 +0800
Subject: [PATCH] 文档合并、转换
---
src/main/java/com/product/file/util/FileUtils.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/file/util/FileUtils.java b/src/main/java/com/product/file/util/FileUtils.java
index 789d00f..d97c2bc 100644
--- a/src/main/java/com/product/file/util/FileUtils.java
+++ b/src/main/java/com/product/file/util/FileUtils.java
@@ -559,7 +559,7 @@
}
//绾跨▼鍚屾
if (threadSync) {
- boolean b = convertPdf(uploadServer, isEncrypt, file, placeLocation, fileName);
+ boolean b = convertPdf(uploadServer, isEncrypt, file, placeLocation, fileName,tail);
if (deleteFile && file.isFile()) {
file.delete();
}
@@ -569,7 +569,7 @@
String finalPlaceLocation = placeLocation;
final File ff = FileUtil.copyFile(file, Global.getSystemConfig("temp.dir", "") + "/" + "temp_convert_pdf_" + RandomUtil.randomString(5) + "_" + file.getName(), 0);
executorService.submit(() -> {
- convertPdf(uploadServer, isEncrypt, ff, finalPlaceLocation, fileName);
+ convertPdf(uploadServer, isEncrypt, ff, finalPlaceLocation, fileName,tail);
if (ff.isFile()) {
ff.delete();
}
@@ -582,26 +582,29 @@
return false;
}
- private static boolean convertPdf(boolean uploadServer, boolean isEncrypt, File file, String placeLocation, String fileName) throws BaseException {
+ private static boolean convertPdf(boolean uploadServer, boolean isEncrypt, File file, String placeLocation, String fileName,String officeType) throws BaseException {
File pdfFile = null;
String random = RandomUtil.randomString(5);
String tempPath = Global.getSystemConfig("temp.dir", "./attachment/temp") + "/" + "convertPDF_" + random + "_" + file.getName();
String tempPathSuccess = Global.getSystemConfig("temp.dir", "./attachment/temp") + "/" + "convertPDF_success_" + random + ".pdf";
try {
FileUtil.copyFile(file, tempPath, 0);
- pdfFile = PdfConcurrenceUtil.convertToPdf(tempPath, tempPathSuccess);
+ pdfFile = PdfConcurrenceUtil.convertToPdf(tempPath, tempPathSuccess,officeType);
String s = Global.getSystemConfig("temp.dir", "") + "/" + "convertPDF_encryptTemp_" + random + ".pdf";
FileUtil.copyFile(pdfFile, s, isEncrypt ? 1 : 0);
pdfFile.delete();
pdfFile = new File(s);
uploadOtherFile(false, uploadServer, placeLocation, pdfFile, fileName);
return true;
- } catch (Exception e) {
+ }
+ catch (BaseException e) {
+ throw e;
+ }catch (Exception e) {
e.printStackTrace();
throw new BaseException(FileCode.CONVERT_PDF_FILE_FAIL);
} finally {
try {
- if (pdfFile.isFile()) {
+ if (pdfFile!=null && pdfFile.isFile()) {
pdfFile.delete();
}
com.product.common.io.FileUtils.delFile(tempPath);
--
Gitblit v1.9.2