From 2752a8b7da4950c64249775a24ee279d7abc2558 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 四月 2025 15:57:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 fd47a38..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
@@ -5,6 +5,7 @@
import freemarker.template.Template;
import freemarker.template.TemplateException;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.util.Units;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.mock.web.MockMultipartFile;
@@ -20,11 +21,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -184,14 +181,12 @@
XWPFDocument document = new XWPFDocument(fis);
XWPFParagraph pic = document.createParagraph();
XWPFRun picRun = pic.createRun();
- XWPFPicture xwpfPicture = picRun.addPicture(
+ 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", xwpfPicture);
-
+ ));
// 处理段落
for (XWPFParagraph paragraph : document.getParagraphs()) {
replaceParagraph(paragraph, dataMap);
--
Gitblit v1.7.1