From f430311eedd5ab5b25d86490ae9396ec96029d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 26 Mar 2024 11:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OnlyOfficeController.java      |  3 +-
 .../impl/BusProcessModelHisServiceImpl.java   | 48 +++++++++++--------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
index 1d69f8d..b63abff 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
@@ -564,6 +564,7 @@ public class OnlyOfficeController {
                 // 发送POST请求并获取响应
                 ResponseEntity<String> responseEntity2 = restTemplate2.postForEntity(bydUploadFileUrl, requestEntity2, String.class);
                 String body2 = responseEntity2.getBody();
+                logger.info("基线版本文件上传接口结果:" + body2);
                 JSONObject jsonObject2 = JSONObject.parseObject(body2);
                 String data = jsonObject2.getString("data");
                 createTimeLatestOnlineFileLog.setBydJxFileId(data);
@@ -571,7 +572,7 @@ public class OnlyOfficeController {
                 createTimeLatestOnlineFileLog2.setBydJxFileId(data);
 
                 this.onlineFileLogDao.insert(createTimeLatestOnlineFileLog2);
-                logger.info("基线版本文件上传接口结果:" + body2);
+//                logger.info("基线版本文件上传接口结果:" + body2);
 
             }catch (Exception ex){
                 ex.printStackTrace();
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
index a4b1d54..14af4ac 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
@@ -564,34 +564,40 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
     public String onlyOfficePreview(JSONObject json) {
         StringBuilder resultSb = new StringBuilder();
         String fileId = json.getString("fileId");
-        String watermark = json.getString("watermark");
+//        String watermark = json.getString("watermark");
 
         // 查询历史信息：1 是   2 否
         String queryType = json.getString("queryType");
         if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_1,queryType)) {
             OnlineFileLog onlineFileLog = onlineFileLogDao.selectById(fileId);
-
-            StringBuffer downloadFileUrl = new StringBuffer();
-            downloadFileUrl.append(downloadUrl).append(onlineFileLog.getFilePath() == null ? "" : onlineFileLog.getFilePath());
-            resultSb.append(previewHistoryUrl);
-            resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&");
-            resultSb.append("fileType=").append("docx").append("&");
-            resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&");
-            resultSb.append("fileUrl=").append(downloadFileUrl.toString()).append("&");
-            resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
-            resultSb.append("filePath=").append(onlineFileLog.getFilePath()).append("&");
-            resultSb.append("fileName=").append(onlineFileLog.getFileName());
+            if(ObjectUtils.isNotEmpty(onlineFileLog)){
+                StringBuffer downloadFileUrl = new StringBuffer();
+                downloadFileUrl.append(downloadUrl).append(onlineFileLog.getFilePath() == null ? "" : onlineFileLog.getFilePath());
+                resultSb.append(previewHistoryUrl);
+                resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&");
+                resultSb.append("fileType=").append("docx").append("&");
+                resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&");
+                resultSb.append("fileUrl=").append(downloadFileUrl.toString()).append("&");
+                resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
+                resultSb.append("filePath=").append(onlineFileLog.getFilePath()).append("&");
+                resultSb.append("fileName=").append(onlineFileLog.getFileName());
+            }else{
+                log.error("onlineFileLog为空，fileId="+fileId);
+            }
         } else if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_2,queryType)) {
             BusProcessModelHis busProcessModelHis = this.processEditFile(fileId);
-
-            resultSb.append(onlyOfficePreviewUrl);
-            resultSb.append("oldFileName=").append(busProcessModelHis.getFileName()).append("&");
-            resultSb.append("fileType=").append("docx").append("&");
-            resultSb.append("attId=").append(busProcessModelHis.getId()).append("&");
-            resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&");
-            resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
-            resultSb.append("filePath=").append(busProcessModelHis.getEditFilePath()).append("&");
-            resultSb.append("fileName=").append(busProcessModelHis.getFileName());
+            if(ObjectUtils.isNotEmpty(busProcessModelHis)){
+                resultSb.append(onlyOfficePreviewUrl);
+                resultSb.append("oldFileName=").append(busProcessModelHis.getFileName()).append("&");
+                resultSb.append("fileType=").append("docx").append("&");
+                resultSb.append("attId=").append(busProcessModelHis.getId()).append("&");
+                resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&");
+                resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
+                resultSb.append("filePath=").append(busProcessModelHis.getEditFilePath()).append("&");
+                resultSb.append("fileName=").append(busProcessModelHis.getFileName());
+            }else{
+                log.error("busProcessModelHis为空，fileId="+fileId);
+            }
         }
         return resultSb.toString();
     }