From 28640fa008701e22fe1d1c54c31690d150914d4b Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 16 七月 2024 18:36:29 +0800
Subject: [PATCH] 套红文档合并
---
src/main/java/com/product/file/util/FileUtil.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/product/file/util/FileUtil.java b/src/main/java/com/product/file/util/FileUtil.java
index 33a326b..a7cdaa2 100644
--- a/src/main/java/com/product/file/util/FileUtil.java
+++ b/src/main/java/com/product/file/util/FileUtil.java
@@ -1,9 +1,8 @@
package com.product.file.util;
import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.poi.word.WordUtil;
import com.aspose.words.Document;
+import com.aspose.words.SaveFormat;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.xwpf.NiceXWPFDocument;
import com.google.common.collect.Maps;
@@ -13,10 +12,6 @@
import com.product.file.config.CmnConst;
import com.product.file.config.FileCode;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.text.WordUtils;
-import org.apache.log4j.Logger;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
import java.io.*;
import java.util.List;
@@ -34,8 +29,6 @@
*/
@Slf4j
public class FileUtil {
- private static Properties properties;
-
private FileUtil() {
}
@@ -83,6 +76,9 @@
}
public static File toDocx(File file) {
+ if (!AsposeUtil.getLicense(2)) {
+ return file;
+ }
String docxName = UUID.randomUUID().toString() + ".docx";
File docxFile = new File(file.getParent() + File.separator + docxName);
String tempDir = Global.getSystemConfig("temp.dir", "./attachment/temp");
@@ -90,6 +86,24 @@
try {
Document document = new Document(new FileInputStream(file));
document.save(tempFile.getAbsolutePath(), com.aspose.words.SaveFormat.DOCX);
+ return tempFile;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return docxFile;
+ }
+
+ public static File toDoc(File file) {
+ if (!AsposeUtil.getLicense(2)) {
+ return file;
+ }
+ String docxName = UUID.randomUUID().toString() + ".doc";
+ File docxFile = new File(file.getParent() + File.separator + docxName);
+ String tempDir = Global.getSystemConfig("temp.dir", "./attachment/temp");
+ File tempFile = new File(tempDir + File.separator + docxName);
+ try {
+ Document document = new Document(new FileInputStream(file));
+ document.save(tempFile.getAbsolutePath(), SaveFormat.DOC);
return tempFile;
} catch (Exception e) {
e.printStackTrace();
@@ -105,7 +119,6 @@
* @return zip鏂囦欢淇濆瓨缁濆璺緞
*/
public static long createZip(List<Map<String, String>> pathList, OutputStream os) {
- log.info("姝ｅ湪鎵撳寘鏂囦欢...");
try {
long size = 0;
ZipOutputStream out = new ZipOutputStream(os);
@@ -130,7 +143,6 @@
fileName = head + "(" + showCount + ")." + tail;
}
fileNameCountMap.put(fileName, ++showCount);
- log.info(String.format("姝ｅ湪鎵撳寘鏂囦欢 %s", fileName));
//浠ヨ鏂囨爣棰樹负姣忎釜鏂囦欢鍛藉悕
FileInputStream fis = new FileInputStream(downloadPath);
@@ -142,11 +154,9 @@
while ((len = fis.read(buffer)) > 0) {
if (symbol == 1) {
// 鍔犲瘑
- log.info("姝ｅ湪鍔犲瘑...");
out.write(encryption(buffer), 0, len);
} else if (symbol == -1) {
// 瑙ｅ瘑
- log.info("姝ｅ湪瑙ｅ瘑...");
out.write(decryption(buffer), 0, len);
} else {
// 鍗曠函鐨勫鍒�
--
Gitblit v1.9.2