From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
zt/core/src/main/java/com/zt/modules/oss/cloud/LocalStorageService.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/zt/core/src/main/java/com/zt/modules/oss/cloud/LocalStorageService.java b/zt/core/src/main/java/com/zt/modules/oss/cloud/LocalStorageService.java
index ec5a4f9..8137a9e 100644
--- a/zt/core/src/main/java/com/zt/modules/oss/cloud/LocalStorageService.java
+++ b/zt/core/src/main/java/com/zt/modules/oss/cloud/LocalStorageService.java
@@ -8,12 +8,12 @@
package com.zt.modules.oss.cloud;
-
+import com.aspose.words.Document;
+import com.aspose.words.SaveFormat;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.spire.xls.Workbook;
import com.zt.common.exception.ErrorCode;
import com.zt.common.exception.RenException;
-import com.zt.common.utils.CommonUtils;
import com.zt.core.oss.encry.IOssEncryptService;
import com.zt.modules.oss.enums.CloudChannel;
import com.zt.modules.oss.model.QdSysOss;
@@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;
-import java.util.Date;
+import java.nio.charset.StandardCharsets;
/**
* 鏈湴涓婁紶
@@ -98,8 +98,6 @@
}
public void content(SysOss oss, HttpServletResponse response) throws Exception {
- Date beginDate = new Date();
- Date lastDate = beginDate;
if (oss == null) {
throw new IOException("鏂囦欢涓嶅瓨鍦紒");
}
@@ -118,15 +116,7 @@
System.out.println(File.separator);
System.out.println(oss.getPath());
// 鍒涘缓鏂囦欢杈撳叆娴�
- Date nowDate = new Date();
- System.out.println("鍑嗗鏃堕棿锛�" + CommonUtils.getDatePoor(nowDate, lastDate));
- lastDate = nowDate;
-
InputStream is = ossEncryptService.decrypt(file);
-
- nowDate = new Date();
- System.out.println("瑙ｅ瘑鏃堕棿锛�" + CommonUtils.getDatePoor(nowDate, lastDate));
- lastDate = nowDate;
// 鍝嶅簲杈撳嚭娴�
ServletOutputStream out = response.getOutputStream();
// 鍒涘缓缂撳啿鍖�
@@ -138,9 +128,6 @@
is.close();
out.flush();
out.close();
- nowDate = new Date();
- System.out.println("杈撳嚭鏃堕棿锛�" + CommonUtils.getDatePoor(nowDate, lastDate));
- System.out.println("鎬绘椂闂达細" + CommonUtils.getDatePoor(nowDate, beginDate));
}
}
@@ -166,7 +153,18 @@
workbook.saveToStream(outputStream, com.spire.xls.FileFormat.Version2013); // 鎸囧畾鏂囦欢鏍煎紡
documentBytes = outputStream.toByteArray();
headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
- } else if (filename.endsWith(".docx") || filename.endsWith(".xlsx")) {
+ }
+
+ if (filename.endsWith(".doc")) {
+ // 浣跨敤 Aspose.Words 杩涜鏂囨。杞崲
+ Document doc = new Document(in);
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ doc.save(outputStream, SaveFormat.DOCX);
+
+ documentBytes = outputStream.toByteArray();
+ headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+ headers.setContentDispositionFormData("attachment", filename.replace(".doc", ".docx"));
+ } else if (filename.endsWith(".docx") || filename.endsWith(".xlsx")) {
documentBytes = FileCopyUtils.copyToByteArray(in);
headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
headers.setContentDispositionFormData("attachment", filename);
@@ -252,7 +250,6 @@
is.close();
out.flush();
out.close();
-
}
}
}
--
Gitblit v1.9.1