From 7a26906b09ee1fb5fba3bfdec3807ff5cb70e671 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 24 Jan 2024 09:54:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onlyoffice/controller/OnlyOfficeController.java       | 1 +
 .../modules/onlyoffice/service/LawsUserInfoService.java   | 1 +
 .../service/impl/BusProcessModelHisServiceImpl.java       | 8 +++-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
index 4e380293..898e8cb6 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
@@ -347,6 +347,7 @@ public class OnlyOfficeController {
             for (OnlineFileLog onlineFileLog : onlineFileLogList) {
                 Map<String, String> map = new HashMap<>();
                 map.put("id", onlineFileLog.getId());
+                map.put("filePath", onlineFileLog.getFilePath());
                 map.put("fileName", fileName);
                 map.put("attFileId", onlineFileLog.getAttFileId());
                 map.put("createTime", sdf.format(onlineFileLog.getCreateTime()));
diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java
index 7790a394..3e38174e 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java
@@ -110,6 +110,7 @@ public class LawsUserInfoService {
         onlineFileLog.setFileName(String.valueOf(time));
         onlineFileLog.setValidFlag("0");
         onlineFileLog.setFileKey(key);
+        onlineFileLog.setFilePath(fileUrl);
         onlineFileLogDao.insert(onlineFileLog);
         log.info("======================日志存入成功===============================");
         if (StringUtils.isNotBlank(standName)) {
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 b817e516..b70fa970 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
@@ -2,7 +2,6 @@ package com.jero.modules.onlyoffice.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.util.MinioUtil;
 import com.jero.modules.onlyoffice.entity.BusProcessModelHis;
 import com.jero.modules.onlyoffice.entity.OnlineFileLog;
 import com.jero.modules.onlyoffice.mapper.BusProcessModelHisMapper;
@@ -14,11 +13,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.UUID;
 
@@ -135,7 +133,8 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
         try {
             File file = new File(filePath + path);
             inputStream = new BufferedInputStream(Files.newInputStream(file.toPath()));
-            response.addHeader("Content-Disposition", "attachment;fileName=" + new String(file.getName().getBytes("UTF-8"), "iso-8859-1"));
+            response.addHeader("Content-Disposition", "attachment;fileName="
+                    + new String(file.getName().getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
             response.setContentType("application/force-download");// 设置强制下载不打开
             outputStream = response.getOutputStream();
             byte[] buf = new byte[1024];
@@ -163,7 +162,6 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
                 }
             }
         }
-
     }
 
     /**