From 75ef4de1c55e6029fbd2b37ee3b52665c9135b5f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 15:27:41 +0800
Subject: [PATCH] 1. 派遣查询修改 2. 车辆定位接口修改，会报空指针 3. 日志输出修改管理 4. 证书导出Png图片不显示bug修复
---
src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java b/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
index 4e72d3a..358c126 100644
--- a/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
+++ b/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
@@ -346,6 +346,9 @@
//如果头像有
if (null != list.get(i).getAvatar() && list.get(i).getAvatar() != "") {
if (list.get(i).getAvatar().contains("http:")) {
+ //获取图片格式
+ int lastIndexOf = list.get(i).getAvatar().lastIndexOf(".");
+ String pictureType = list.get(i).getAvatar().substring(lastIndexOf + 1);
//画图的顶级管理器，一个sheet只能获取一个（一定要注意这点）
BufferedImage bufferImg = null;
//先把读进来的图片放到一个ByteArrayOutputStream中，以便产生ByteArray
@@ -356,7 +359,7 @@
e.printStackTrace();
}
try {
- ImageIO.write(bufferImg, "jpg", byteArrayOut);
+ ImageIO.write(bufferImg, pictureType, byteArrayOut);
} catch (IOException e) {
e.printStackTrace();
}
@@ -367,9 +370,9 @@
0, // y缩放
1023, //最大1023
255, //最大255
- (short) i, //宽度占几格 0开始
+ (short) i, //宽度 0开始
0, //在第几行
- (short) i, //宽度占几格 0开始
+ (short) i, //宽度 0开始
0 //第几列
);
//插入图片
@@ -397,14 +400,16 @@
}
//判断余下的
if (excelList.size()>0){
- rowNum++;
+ rowNum = rowNum + 2;
//写入表格
writeBookForEach(excelList,rowNum,workBook,sheet,patriarch);
}
}
//导出数据
- response.setContentType("application/vnd.ms-excel; charset=UTF-8");
- response.setHeader("Content-Disposition", "attachment;filename=" + "证书打印信息导出"+DateUtil.time() + ".xlsx");
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
+ String fileName = URLEncoder.encode("证书打印信息导出"+ DateUtil.time(), Charsets.UTF_8.name());
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
workBook.write(response.getOutputStream());
}
@@ -427,6 +432,9 @@
//如果头像有
if (null != list.get(i).getAvatar() && list.get(i).getAvatar() != "") {
if (list.get(i).getAvatar().contains("http:")) {
+ //获取图片格式
+ int lastIndexOf = list.get(i).getAvatar().lastIndexOf(".");
+ String pictureType = list.get(i).getAvatar().substring(lastIndexOf + 1);
//画图的顶级管理器，一个sheet只能获取一个（一定要注意这点）
BufferedImage bufferImg = null;
//先把读进来的图片放到一个ByteArrayOutputStream中，以便产生ByteArray
@@ -437,7 +445,7 @@
e.printStackTrace();
}
try {
- ImageIO.write(bufferImg, "jpg", byteArrayOut);
+ ImageIO.write(bufferImg, pictureType, byteArrayOut);
} catch (IOException e) {
e.printStackTrace();
}
--
Gitblit v1.9.3