From 53e61b11d4022fd764e1b65b0ada5291fd403853 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 21 Jan 2025 16:04:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../industry/software/common/parse/ExcelParse.java | 2 +- .../industry/software/common/parse/FileParse.java | 2 +- .../industry/software/common/parse/PdfParse.java | 2 +- .../industry/software/common/parse/PptParse.java | 6 +++--- .../industry/software/common/parse/TextParse.java | 2 +- .../industry/software/common/parse/WordParse.java | 2 +- .../industry/software/common/util/EleCommonUtil.java | 2 +- .../industry/software/common/util/OfficeFileUtil.java | 7 +++---- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/ExcelParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/ExcelParse.java index 6a32138..bb7340e 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/ExcelParse.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/ExcelParse.java @@ -10,7 +10,7 @@ import java.io.InputStream; public class ExcelParse extends FileParse { @Override - public String parseContent(InputStream stream, String fileType) { + public String parseAllText(InputStream stream, String fileType) { String fileTmpPath = createFileTmpPath(fileType); String res = ""; try { diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/FileParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/FileParse.java index 9b9d469..0b0baba 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/FileParse.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/FileParse.java @@ -9,7 +9,7 @@ public abstract class FileParse { private static String tmpPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - public abstract String parseContent(InputStream stream, String fileType); + public abstract String parseAllText(InputStream stream, String fileType); protected String createFileTmpPath(String fileType) { String uuid = IdUtil.fastSimpleUUID(); diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PdfParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PdfParse.java index c8b1327..67f690d 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PdfParse.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PdfParse.java @@ -9,7 +9,7 @@ import java.io.InputStream; @Slf4j public class PdfParse extends FileParse { @Override - public String parseContent(InputStream stream, String fileType) { + public String parseAllText(InputStream stream, String fileType) { String res = ""; String fileTmpPath = createFileTmpPath(fileType); try { diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PptParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PptParse.java index 4ebba8f..dfbf7c3 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PptParse.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/PptParse.java @@ -10,15 +10,15 @@ import java.io.InputStream; public class PptParse extends FileParse { @Override - public String parseContent(InputStream stream, String fileType) { + public String parseAllText(InputStream stream, String fileType) { String fileTmpPath = createFileTmpPath(fileType); String res = ""; try { FileUtil.writeFromStream(stream, fileTmpPath); if (fileType.endsWith("pptx")) { - return OfficeFileUtil.parsePptxAllText(fileTmpPath); + res = OfficeFileUtil.parsePptxAllText(fileTmpPath); } - return OfficeFileUtil.parsePptAllText(fileTmpPath); + res = OfficeFileUtil.parsePptAllText(fileTmpPath); } catch (Exception e) { log.error("解析{}格式的ppt错误，具体为{}",fileType, e.getMessage(), e); } diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/TextParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/TextParse.java index ad29da7..e6e620d 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/TextParse.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/TextParse.java @@ -10,7 +10,7 @@ import java.nio.charset.Charset; public class TextParse extends FileParse { @Override - public String parseContent(InputStream stream, String fileType) { + public String parseAllText(InputStream stream, String fileType) { String fileTmpPath = createFileTmpPath(fileType); String res = ""; try { diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/WordParse.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/WordParse.java index bd003c2..f31d8cc 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/WordParse.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/WordParse.java @@ -10,7 +10,7 @@ import java.io.InputStream; public class WordParse extends FileParse { @Override - public String parseContent(InputStream stream, String fileType) { + public String parseAllText(InputStream stream, String fileType) { String fileTmpPath = createFileTmpPath(fileType); String res = ""; try { diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java index 4e4b0d5..db23f7c 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java @@ -81,7 +81,7 @@ public final class EleCommonUtil { public static String parse(InputStream inputStream, String fileType) { FileParse fileParse = PARSE_MAP.getOrDefault(fileType, new TextParse()); - return fileParse.parseContent(inputStream, fileType); + return fileParse.parseAllText(inputStream, fileType); } } diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/OfficeFileUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/OfficeFileUtil.java index 9289378..115e07e 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/OfficeFileUtil.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/OfficeFileUtil.java @@ -33,21 +33,20 @@ import java.util.Objects; @Slf4j public class OfficeFileUtil { - private static final IConverter CONVERT = LocalConverter.builder().build(); - public static void doc2pdf(String wordPath, String pdfPath) { if (EleCommonUtil.isWinOs()) { File inputWord = new File(wordPath); File outputFile = new File(pdfPath); try(InputStream docxInputStream = Files.newInputStream(inputWord.toPath()); OutputStream outputStream = Files.newOutputStream(outputFile.toPath())) { - boolean execute = CONVERT.convert(docxInputStream) + IConverter build = LocalConverter.builder().build(); + boolean execute = build.convert(docxInputStream) .as(DocumentType.DOCX) .to(outputStream) .as(DocumentType.PDF).schedule().get(); Assert.isTrue(execute, "转换失败"); log.info("转换完毕 targetPath = {}", outputFile.getAbsolutePath()); - CONVERT.shutDown(); + build.shutDown(); } catch (Exception e) { log.error("[documents4J] word转pdf失败:{}", e.toString()); String info = StrFormatter.format("word文档{}转换成pdf文档{}失败", wordPath, pdfPath);