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 | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 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 6162b94..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);
}
// 处理表格
@@ -200,7 +198,6 @@
for (XWPFTableCell cell : row.getTableCells()) {
for (XWPFParagraph paragraph : cell.getParagraphs()) {
replaceParagraph(paragraph, dataMap);
- replaceParagraph1(paragraph);
}
}
}
@@ -279,21 +276,6 @@
for (ReplacementInfo info : replacements) {
replaceRunRange(paragraph, info);
- }
- }
- private static void replaceParagraph1(XWPFParagraph paragraph) throws IOException, InvalidFormatException {
- System.out.println("有image1");
- List<XWPFRun> runs = paragraph.getRuns();
- for (XWPFRun r : runs) {
- String text = r.getText(0);
- if (text != null && text.contains("{{image}}")) {
- System.out.println("有image2");
- 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