From 0a2013ac0a8356c4bdbc44ba05e622b54d9bebed Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 15 十二月 2023 17:22:38 +0800
Subject: [PATCH] 修改
---
core/src/main/java/com/zt/life/export/service/WordFileService.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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..1d304c2 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,10 +14,13 @@
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.text.SimpleDateFormat;
import java.util.*;
@Service
@@ -59,27 +62,39 @@
Object staticFieldValue = ReflectUtil.getFieldValue(dataObj, field.getName()); // 灞炴�у搴旂殑鏁版嵁
if (typeName.contains("com.zt.life.modules")) {
formatWordData(staticFieldValue, wordData, builder);
- } else {
+ }else {
if (field.getType().getName().equals("java.util.List")) {
builder.bind(fieldName, new HackLoopTableRenderPolicy());
} else if (staticFieldValue != null) {
+ if (typeName.contains("java.util.Date") && fieldName.contains("Date")) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ staticFieldValue=sdf.format(staticFieldValue);
+ }
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);
}
+ if (wordData.get(fieldName) == null)
+ wordData.put(fieldName, staticFieldValue);
}
}
}
--
Gitblit v1.9.1