From 86deeff2904661cfab0cec439c2c838f8001598a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 四月 2025 15:51:11 +0800
Subject: [PATCH] bug修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java |   27 ++++++---------------------
 1 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
index 7fb9d31..1960ab0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
@@ -181,17 +181,15 @@
             XWPFDocument document = new XWPFDocument(fis);
             XWPFParagraph pic = document.createParagraph();
             XWPFRun picRun = pic.createRun();
-            Map<String, Object> dataMap1 = new HashMap<>();
-//            dataMap.put("${picture}", picRun.addPicture(
-//                    new FileInputStream("/usr/local/project/file/1.jpg"), XWPFDocument.PICTURE_TYPE_JPEG,
-//                    "/usr/local/project/file/1.jpg",
-//                    Units.toEMU(60),
-//                    Units.toEMU(30)
-//            ));
+            dataMap.put("${picture}", picRun.addPicture(
+                    new FileInputStream("/usr/local/project/file/1.jpg"), XWPFDocument.PICTURE_TYPE_JPEG,
+                    "/usr/local/project/file/1.jpg",
+                    Units.toEMU(60),
+                    Units.toEMU(30)
+            ));
             // 处理段落
             for (XWPFParagraph paragraph : document.getParagraphs()) {
                 replaceParagraph(paragraph, dataMap);
-                replaceParagraph1(paragraph);
             }
 
             // 处理表格
@@ -278,19 +276,6 @@
 
         for (ReplacementInfo info : replacements) {
             replaceRunRange(paragraph, info);
-        }
-    }
-    private static void replaceParagraph1(XWPFParagraph paragraph) throws IOException, InvalidFormatException {
-        List<XWPFRun> runs = paragraph.getRuns();
-        for (XWPFRun r : runs) {
-            String text = r.getText(0);
-            if (text != null && text.contains("{{image}}")) {
-                r.setText("", 0);
-                FileInputStream is = new FileInputStream("/usr/local/project/file/1.jpg");
-                r.addBreak();
-                r.addPicture(is, XWPFDocument.PICTURE_TYPE_JPEG, "/usr/local/project/file/1.jpg", Units.toEMU(60), Units.toEMU(30));
-                is.close();
-            }
         }
     }
 

--
Gitblit v1.7.1