From dc352ea3b9ec925320784592f29ca640b3a7b2ea Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 05 十二月 2023 14:05:44 +0800
Subject: [PATCH] 6
---
core/src/main/java/com/zt/life/export/service/WordFileService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/com/zt/life/export/service/WordFileService.java b/core/src/main/java/com/zt/life/export/service/WordFileService.java
index 0576d03..3ef75f1 100644
--- a/core/src/main/java/com/zt/life/export/service/WordFileService.java
+++ b/core/src/main/java/com/zt/life/export/service/WordFileService.java
@@ -14,8 +14,10 @@
import org.springframework.stereotype.Service;
+import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
import java.io.*;
import java.lang.reflect.Field;
import java.util.*;
@@ -65,20 +67,26 @@
} else if (staticFieldValue != null) {
String valStr = staticFieldValue.toString();
if (valStr.contains("鏂囦欢鍥剧墖:")) {
- valStr = valStr.replace("鏂囦欢鍥剧墖:", "");
+ valStr = localPath + valStr.replace("鏂囦欢鍥剧墖:", "");
File file = new File(valStr);
if (file.exists()) {
try (InputStream in = ossEncryptService.decrypt(file)) {
- staticFieldValue = new PictureRenderData(500, 500, ".png", in);
+ InputStream in2 = ossEncryptService.decrypt(file);
+ BufferedImage bufferedImage = ImageIO.read(in2);
+ int width = bufferedImage.getWidth();
+ int height = bufferedImage.getHeight();
+ staticFieldValue = new PictureRenderData(width, height, ".png", in);
/*staticFieldValue = new PictureRenderData(80, 100, "d://" + valStr);*/
} catch (IOException e) {
e.printStackTrace();
}
+ } else {
+ staticFieldValue = new PictureRenderData(100, 30, "template/noSign.png");
}
- if (wordData.get(fieldName) == null)
- wordData.put(fieldName, staticFieldValue);
}
}
+ if (wordData.get(fieldName) == null)
+ wordData.put(fieldName, staticFieldValue);
}
}
}
--
Gitblit v1.9.1