From a7e5e29bd9771b9cc65cfe09d213c470bbe4166b Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 17 七月 2024 18:28:11 +0800
Subject: [PATCH] 添加pom版本号
---
src/main/java/com/product/file/service/MergeDoc.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/product/file/service/MergeDoc.java b/src/main/java/com/product/file/service/MergeDoc.java
index 58343ea..cf29496 100644
--- a/src/main/java/com/product/file/service/MergeDoc.java
+++ b/src/main/java/com/product/file/service/MergeDoc.java
@@ -1,16 +1,10 @@
package com.product.file.service;
import cn.hutool.core.io.FileUtil;
-import com.product.file.util.AsposeUtil;
-import com.product.file.util.FileUtils;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.apache.xmlbeans.XmlOptions;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBody;
import java.io.*;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -24,16 +18,19 @@
* @param srcDocxs 闇�瑕佸悎骞剁殑鐩爣docx鏂囦欢
* @param response 鍚堝苟鍚庣殑docx杈撳嚭鏂囦欢
*/
- public static File mergeDoc(List<File> srcDocxs, String tempFilePath) {
+ public static File mergeDoc(List<File> srcDocxs, String tempFilePath) throws Exception {
+ File file = null;
if (srcDocxs.size() > 1) {
- File file = srcDocxs.get(0);
+ file = srcDocxs.get(0);
for (int i = 1; i < srcDocxs.size(); i++) {
- file = AsposeUtil.mergeWord(file, srcDocxs.get(i));
+ file = com.product.file.util.FileUtil.mergeFile(file, srcDocxs.get(i));
}
- FileUtil.copyFile(file, new File(tempFilePath));
+ File file1 = new File(tempFilePath);
+ FileUtil.copyFile(file, file1);
FileUtil.del(file);
+ return file1;
}
- return null;
+ return file;
}
/**
--
Gitblit v1.9.2