许鹏程
2023-06-29 c26c4778ffaa583db2d56d82c3c861e724d0000c
poi、easyexcel、poi-tl升级 ,合并空调中的报表、数据源模块
已修改3个文件
38 ■■■■■ 文件已修改
pom.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/file/service/FileManagerService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/test/java/com/product/file/test/FileManagerTest.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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;
        }
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 {