From 586aeb9a99493cc91ddc7491a1606cb1f65bcb8f Mon Sep 17 00:00:00 2001
From: lzy <963565242@qq.com>
Date: Wed, 10 Aug 2022 15:55:40 +0800
Subject: [PATCH] =?UTF-8?q?word=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/easydatabaseexport/ui/ConnectJavaFrame.java  | 5 +++--
 src/main/java/com/easydatabaseexport/util/AddToTopic.java | 8 +-------
 .../java/com/easydatabaseexport/util/WordReporter.java    | 4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/easydatabaseexport/ui/ConnectJavaFrame.java b/src/main/java/com/easydatabaseexport/ui/ConnectJavaFrame.java
index 0b8ef48..c3a03c7 100644
--- a/src/main/java/com/easydatabaseexport/ui/ConnectJavaFrame.java
+++ b/src/main/java/com/easydatabaseexport/ui/ConnectJavaFrame.java
@@ -24,6 +24,7 @@ import com.easydatabaseexport.util.SwingUtils;
 import com.easydatabaseexport.util.WordReporter;
 import lombok.SneakyThrows;
 import lombok.extern.java.Log;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
 
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -353,9 +354,9 @@ public class ConnectJavaFrame {
                             wordReporter.setTempLocalPath(filePath);
                             wordReporter.init();
                             wordReporter.exportWORD(listMap, indexMap, 0);
-                            wordReporter.generate(file.getAbsolutePath());
+                            XWPFDocument document = wordReporter.generate(file.getAbsolutePath());
                             //添加目录
-                            AddToTopic.generateTOC(file.getAbsolutePath(), file.getAbsolutePath());
+                            AddToTopic.generateTOC(document, file.getAbsolutePath());
                             int k = JOptionPane.showConfirmDialog(null, "导出成功！\n文件已保存到："
                                     + file.getAbsolutePath() + "\n是否立即打开查看文件？", "成功", JOptionPane.YES_NO_OPTION);
                             if (k == 0) {
diff --git a/src/main/java/com/easydatabaseexport/util/AddToTopic.java b/src/main/java/com/easydatabaseexport/util/AddToTopic.java
index fffb48b..f8af397 100644
--- a/src/main/java/com/easydatabaseexport/util/AddToTopic.java
+++ b/src/main/java/com/easydatabaseexport/util/AddToTopic.java
@@ -26,12 +26,9 @@ public class AddToTopic {
         generateTOC("C:\\Users\\admin\\Desktop\\1.doc","C:\\Users\\admin\\Desktop\\2.doc");
     }*/
 
-    public static void generateTOC(String sourcePath, String targetPath) throws IOException {
-        FileInputStream fileInputStream = null;
+    public static void generateTOC(XWPFDocument document, String targetPath) throws IOException {
         OutputStream out = null;
         try {
-            fileInputStream = new FileInputStream(sourcePath);
-            XWPFDocument document = new XWPFDocument(fileInputStream);
             String findText = "目录哈哈";
             String replaceText = "";
             for (XWPFParagraph p : document.getParagraphs()) {
@@ -52,9 +49,6 @@ public class AddToTopic {
         } catch (Exception e) {
             LogManager.writeLogFile(e, log);
         } finally {
-            if (fileInputStream != null) {
-                fileInputStream.close();
-            }
             if (out != null) {
                 out.close();
             }
diff --git a/src/main/java/com/easydatabaseexport/util/WordReporter.java b/src/main/java/com/easydatabaseexport/util/WordReporter.java
index bdf68a9..8426b77 100644
--- a/src/main/java/com/easydatabaseexport/util/WordReporter.java
+++ b/src/main/java/com/easydatabaseexport/util/WordReporter.java
@@ -860,12 +860,12 @@ public class WordReporter {
      * @return
      * @throws IOException
      */
-    public boolean generate(String outDocPath) throws IOException {
+    public XWPFDocument generate(String outDocPath) throws IOException {
         outputStream = new FileOutputStream(outDocPath);
         xwpfDocument.write(outputStream);
         this.close(outputStream);
         this.close(inputStream);
-        return true;
+        return xwpfDocument;
     }
 
     /**
-- 
Gitee