From 21ee580fc71b20fae5fb189f51973a0aa9042b45 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 25 Mar 2025 12:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0word=E8=BD=ACpdf=E7=9A=84?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java      | 2 +-
 .../industry/software/common/util/OfficeFileUtil.java          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index b447693..cbf7244 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -1308,7 +1308,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             EleCommonUtil.decryptFile(fileSaveTmpPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
 
             if (Arrays.asList("doc", "docx").contains(fileInfo.getFileType())) {
-                String pdfTmpPath = elePropertyConfig.getEleTmpPath() + File.separator + fileInfo.getFileName() + "_" + IdUtil.fastSimpleUUID() + ".pdf";
+                String pdfTmpPath = elePropertyConfig.getEleTmpPath() + File.separator + fileInfo.getId()+ ".pdf";
                 OfficeFileUtil.doc2pdf(fileSaveTmpPath, pdfTmpPath);
                 fileSaveTmpPath = pdfTmpPath;
             }
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 1bfb054..1a16255 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
@@ -36,6 +36,9 @@ import java.util.Objects;
 public class OfficeFileUtil {
 
     public static void doc2pdf(String wordPath, String pdfPath) {
+        if (FileUtil.exist(pdfPath)) {
+            return;
+        }
         log.info("Start convert word file to pdf, word path: {}, pdf path: {}", wordPath, pdfPath);
         if (EleCommonUtil.isWinOs()) {
             File inputWord = new File(wordPath);