From edb4e5bd759a477ccc9768e70b7e05b62b4a0b79 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 25 Apr 2024 18:03:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=87=E4=BB=B6=E8=BD=AC=E6=8D=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusProcessModelHisServiceImpl.java        |  2 +-
 .../onlyoffice/utils/OnlyOfficePdfUtil.java        | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
index c3d5d4db..091a5855 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
@@ -406,7 +406,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
             ossFileService.updateById(replaceFile);
             // 将文件扩展名去掉
             String fileTitleName = fileName.substring(0, fileName.lastIndexOf("."));
-            onlineOfficePdfUtil.convertAndSavePdfFile(fileTitleName, ossFile.getId(), his.getEditFilePath());
+            onlineOfficePdfUtil.convertAndSavePdfFile(fileTitleName, replaceFile.getId(), his.getEditFilePath());
         }
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/utils/OnlyOfficePdfUtil.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/utils/OnlyOfficePdfUtil.java
index 3488071c..d70fd13d 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/utils/OnlyOfficePdfUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/utils/OnlyOfficePdfUtil.java
@@ -32,6 +32,7 @@ import javax.annotation.Resource;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * @author: Mzaxd
@@ -59,15 +60,16 @@ public class OnlyOfficePdfUtil {
     private static final int TIMEOUT = 60000; // 通用超时设置
 
     @SneakyThrows
-    public void convertAndSavePdfFile(String fileName, String key, String onlineFilePath) {
-        log.info("转换的请求参数：onlyOfficeUrl:{}, filePdfName:{}, key:{}, onlineFilePath:{}", onlyOfficeUrl, fileName, key, onlineFilePath);
+    public void convertAndSavePdfFile(String fileName, String originFileId, String onlineFilePath) {
+        String key = UUID.randomUUID().toString();
+        log.info("转换的请求参数：onlyOfficeUrl:{}, filePdfName:{}, key:{}, originFileId:{}, onlineFilePath:{}", onlyOfficeUrl, fileName, key, originFileId, onlineFilePath);
         // 获取onlyOffice转换后文件的url
         String fileUrl = convertFile(fileName, key, onlineFilePath);
         log.info("文件转换后PDF的URL: {}", fileUrl);
 
         try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
             // 根据url获取转换后的文件
-            fetchAndSaveFile(httpClient, fileName, fileUrl, key);
+            fetchAndSaveFile(httpClient, fileName, fileUrl, originFileId);
         } // 自动关闭httpClient
     }
 
@@ -109,7 +111,7 @@ public class OnlyOfficePdfUtil {
     }
 
     @SneakyThrows
-    private void fetchAndSaveFile(CloseableHttpClient httpClient, String fileName, String fileUrl, String key) {
+    private void fetchAndSaveFile(CloseableHttpClient httpClient, String fileName, String fileUrl, String originFileId) {
         String pdfFileName =  fileName + ".pdf";
         HttpGet get = new HttpGet(fileUrl);
         try (CloseableHttpResponse response = httpClient.execute(get)) {
@@ -125,7 +127,7 @@ public class OnlyOfficePdfUtil {
                     if (oConvertUtils.isNotEmpty(savePath)) {
                         // 如果有的话，删除原来的pdf版本
                         LambdaQueryWrapper<OSSFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                        lambdaQueryWrapper.eq(OSSFile::getBindId, key);
+                        lambdaQueryWrapper.eq(OSSFile::getBindId, originFileId);
                         ossFileService.remove(lambdaQueryWrapper);
 
                         // 上传成功 进行数据库存储
@@ -133,7 +135,7 @@ public class OnlyOfficePdfUtil {
                         // 文件名
                         ossFile.setFileName(pdfFileName);
                         ossFile.setUrl(savePath);
-                        ossFile.setBindId(key);
+                        ossFile.setBindId(originFileId);
                         ossFileService.save(ossFile);
                     }
                 }