From 579b54d2be9f018bb2b0d37561481aa027a23a5c Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 19 Jun 2023 14:45:43 +0800
Subject: [PATCH] =?UTF-8?q?39=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarBussionessStandServiceImpl.java    |  5 +----
 .../java/com/adc/da/utils/util/OnlyofficePdfUtil.java  | 10 +++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index d3a3d4f0..af5509ce 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -219,9 +219,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Autowired
     private OnlineFileLogDao onlineFileLogDao;
 
-    @Autowired
-    private OnlyofficePdfUtil onlyofficePdfUtil;
-
     @Override
     public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
         SarBussionessStand bussionessStand = new SarBussionessStand();
@@ -4932,7 +4929,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                     if(!onlineFileLogs.isEmpty()){
                         if(StringUtils.isNotBlank(onlineFileLogs.get(0).getOLdFileName()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilekey()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilePath())){
                             try {
-                                onlyofficePdfUtil.downloadFile(onlineFileLogs.get(0).getOLdFileName(), onlineFileLogs.get(0).getFilekey(), onlineFileLogs.get(0).getFilePath());
+                                OnlyofficePdfUtil.downloadFile(filePath,onlineFileLogs.get(0).getOLdFileName(), onlineFileLogs.get(0).getFilekey(), onlineFileLogs.get(0).getFilePath());
                                 File file = new File(filePath+"/onlineFile/"+onlineFileLogs.get(0).getOLdFileName());
                                 if(file.exists()){
                                     AttFileVo attFileVo = attFileEOService.saveFileInfo(file);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java
index 52302513..d4b6c5fe 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java
@@ -19,7 +19,6 @@ import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.io.*;
 import java.util.HashMap;
@@ -27,10 +26,7 @@ import java.util.Map;
 
 public class OnlyofficePdfUtil {
 
-    @Value("${file.path}")
-    private String filePathInfo;//文件存储路径
-
-    public ResponseMessage downloadFile(String filePdfName, String key, String onlineFilePath) throws Exception {
+    public static ResponseMessage downloadFile(String filePathInfo,String filePdfName, String key, String onlineFilePath) throws Exception {
 
         String filePath = filePathInfo+"/onlineFile/"+filePdfName;
 
@@ -144,7 +140,7 @@ public class OnlyofficePdfUtil {
 
     }
 
-    public String analysisXML(String xmlString) throws DocumentException {
+    public static String analysisXML(String xmlString) throws DocumentException {
 
         Document document = DocumentHelper.parseText(xmlString);
 
@@ -158,7 +154,7 @@ public class OnlyofficePdfUtil {
 
     }
 
-    public String convertFile(String key,String onlineFilePath) throws Exception{
+    public static String convertFile(String key, String onlineFilePath) throws Exception{
 
         String url = "http://47.92.92.38:8103/7.2.1-34/ConvertService.ashx";