From c26c4778ffaa583db2d56d82c3c861e724d0000c Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 六月 2023 09:32:36 +0800
Subject: [PATCH] poi、easyexcel、poi-tl升级 ，合并空调中的报表、数据源模块
---
src/test/java/com/product/file/test/FileManagerTest.java | 4 ++--
pom.xml | 30 ++++++++++--------------------
src/main/java/com/product/file/service/FileManagerService.java | 4 ++--
3 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index ed78247..fadae88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,30 +66,20 @@
<version>3.7.2</version>
</dependency>
<dependency>
- <groupId>cn.afterturn</groupId>
- <artifactId>easypoi-base</artifactId>
- <version>4.1.3</version>
- </dependency>
- <dependency>
- <groupId>cn.afterturn</groupId>
- <artifactId>easypoi-annotation</artifactId>
- <version>4.1.3</version>
- </dependency>
- <dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.6</version>
</dependency>
- <dependency>
- <groupId>com.aspose</groupId>
- <artifactId>aspose-cells</artifactId>
- <version>23.6.1</version>
- </dependency>
- <dependency>
- <groupId>org.aspose</groupId>
- <artifactId>slides-line</artifactId>
- <version>15.9.0</version>
- </dependency>
+ <dependency>
+ <groupId>com.aspose</groupId>
+ <artifactId>aspose-cells</artifactId>
+ <version>23.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspose</groupId>
+ <artifactId>slides-line</artifactId>
+ <version>15.9.0</version>
+ </dependency>
<dependency>
<groupId>com.aspose</groupId>
<artifactId>aspose-words</artifactId>
diff --git a/src/main/java/com/product/file/service/FileManagerService.java b/src/main/java/com/product/file/service/FileManagerService.java
index 02613ba..dee9482 100644
--- a/src/main/java/com/product/file/service/FileManagerService.java
+++ b/src/main/java/com/product/file/service/FileManagerService.java
@@ -406,8 +406,8 @@
String viewOnlineSign = attachmentFse.getString(CmnConst.VIEW_ONLINE_SIGN);
boolean encrptSignFlag = "1".equals(attachmentFse.getString(CmnConst.ENCRPT_SIGN));
boolean needOnlineViewFlag = "1".equals(fse.getString(CmnConst.NEED_ONLINE_VIEW)) && "1".equals(viewOnlineSign);
- if (needOnlineViewFlag) {
- // 闇�瑕佸湪绾块瑙堜笖杞崲涔嬪悗鎵嶈兘鍦ㄧ嚎棰勮
+ if (needOnlineViewFlag && !realFileName.endsWith(".xlsx") && !realFileName.endsWith(".xls")) {
+ // 闇�瑕佸湪绾块瑙堜笖杞崲涔嬪悗鎵嶈兘鍦ㄧ嚎棰勮 excel 鏂囦欢涓嶉渶瑕佽浆鎹㈢洿鎺ヨ緭鍑洪瑙�
dir += File.separator + CmnConst.TRANSFER_DIR_NAME;
}
diff --git a/src/test/java/com/product/file/test/FileManagerTest.java b/src/test/java/com/product/file/test/FileManagerTest.java
index 36c2865..d6c47aa 100644
--- a/src/test/java/com/product/file/test/FileManagerTest.java
+++ b/src/test/java/com/product/file/test/FileManagerTest.java
@@ -20,7 +20,7 @@
* @Description: 娴嬭瘯
*/
public class FileManagerTest extends HttpTest {
- /*@Test
+ @Test
public void testDownLoadFiles() throws InterruptedException {
Map<String, Object> m = Maps.newHashMap();
m.put("url/api", "/api/fileManager/download-file-zip/v1");
@@ -33,7 +33,7 @@
HttpTest.testFileDownload(m);
Thread.sleep(1000 * 10);
- }*/
+ }
/*@Test
public void testDownLoadFile() throws InterruptedException {
--
Gitblit v1.9.2