From cd3d553f88fb74f1b15eca9fd50b4318956fb01d Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 15 四月 2025 10:51:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 e3153a8..e1edb1b 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,13 +5,8 @@
import freemarker.template.Template;
import freemarker.template.TemplateException;
import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.xwpf.usermodel.UnderlinePatterns;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
+import org.apache.poi.util.Units;
+import org.apache.poi.xwpf.usermodel.*;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@@ -187,6 +182,15 @@
System.setProperty("file.encoding", "UTF-8");
XWPFDocument document = new XWPFDocument(fis);
+ XWPFParagraph pic = document.createParagraph();
+ XWPFRun picRun = pic.createRun();
+ XWPFPicture xwpfPicture = picRun.addPicture(
+ new FileInputStream("C:\\Users\\Admin\\Pictures\\Camera Roll\\1.jpg"), XWPFDocument.PICTURE_TYPE_JPEG,
+ "C:\\Users\\Admin\\Pictures\\Camera Roll\\1.jpg",
+ Units.toEMU(60),
+ Units.toEMU(30)
+ );
+ dataMap.put("picture", xwpfPicture);
// 处理段落
for (XWPFParagraph paragraph : document.getParagraphs()) {
--
Gitblit v1.7.1