admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 支持excel方法抛出json异常

Browse Source
This commit is contained in:
疯狂的狮子Li 2025-03-28 23:12:40 +08:00
parent 7129ad4fac
commit e71d6fa983
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
View File

@ -215,6 +215,9 @@ public class ExcelUtil {
*/ */
public static <T> void exportTemplate(List<T> data, String filename, String templatePath, HttpServletResponse response) { public static <T> void exportTemplate(List<T> data, String filename, String templatePath, HttpServletResponse response) {
try { try {
if (CollUtil.isEmpty(data)) {
throw new IllegalArgumentException("数据为空");
}
resetResponse(filename, response); resetResponse(filename, response);
ServletOutputStream os = response.getOutputStream(); ServletOutputStream os = response.getOutputStream();
exportTemplate(data, templatePath, os); exportTemplate(data, templatePath, os);
@ -233,9 +236,6 @@ public class ExcelUtil {
* @param os 输出流 * @param os 输出流
*/ */
public static <T> void exportTemplate(List<T> data, String templatePath, OutputStream os) { public static <T> void exportTemplate(List<T> data, String templatePath, OutputStream os) {
if (CollUtil.isEmpty(data)) {
throw new IllegalArgumentException("数据为空");
}
ClassPathResource templateResource = new ClassPathResource(templatePath); ClassPathResource templateResource = new ClassPathResource(templatePath);
ExcelWriter excelWriter = EasyExcel.write(os) ExcelWriter excelWriter = EasyExcel.write(os)
.withTemplate(templateResource.getStream()) .withTemplate(templateResource.getStream())
@ -265,6 +265,9 @@ public class ExcelUtil {
*/ */
public static void exportTemplateMultiList(Map<String, Object> data, String filename, String templatePath, HttpServletResponse response) { public static void exportTemplateMultiList(Map<String, Object> data, String filename, String templatePath, HttpServletResponse response) {
try { try {
if (CollUtil.isEmpty(data)) {
throw new IllegalArgumentException("数据为空");
}
resetResponse(filename, response); resetResponse(filename, response);
ServletOutputStream os = response.getOutputStream(); ServletOutputStream os = response.getOutputStream();
exportTemplateMultiList(data, templatePath, os); exportTemplateMultiList(data, templatePath, os);
@ -285,6 +288,9 @@ public class ExcelUtil {
*/ */
public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String filename, String templatePath, HttpServletResponse response) { public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String filename, String templatePath, HttpServletResponse response) {
try { try {
if (CollUtil.isEmpty(data)) {
throw new IllegalArgumentException("数据为空");
}
resetResponse(filename, response); resetResponse(filename, response);
ServletOutputStream os = response.getOutputStream(); ServletOutputStream os = response.getOutputStream();
exportTemplateMultiSheet(data, templatePath, os); exportTemplateMultiSheet(data, templatePath, os);
@ -303,9 +309,6 @@ public class ExcelUtil {
* @param os 输出流 * @param os 输出流
*/ */
public static void exportTemplateMultiList(Map<String, Object> data, String templatePath, OutputStream os) { public static void exportTemplateMultiList(Map<String, Object> data, String templatePath, OutputStream os) {
if (CollUtil.isEmpty(data)) {
throw new IllegalArgumentException("数据为空");
}
ClassPathResource templateResource = new ClassPathResource(templatePath); ClassPathResource templateResource = new ClassPathResource(templatePath);
ExcelWriter excelWriter = EasyExcel.write(os) ExcelWriter excelWriter = EasyExcel.write(os)
.withTemplate(templateResource.getStream()) .withTemplate(templateResource.getStream())
@ -337,9 +340,6 @@ public class ExcelUtil {
* @param os 输出流 * @param os 输出流
*/ */
public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String templatePath, OutputStream os) { public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String templatePath, OutputStream os) {
if (CollUtil.isEmpty(data)) {
throw new IllegalArgumentException("数据为空");
}
ClassPathResource templateResource = new ClassPathResource(templatePath); ClassPathResource templateResource = new ClassPathResource(templatePath);
ExcelWriter excelWriter = EasyExcel.write(os) ExcelWriter excelWriter = EasyExcel.write(os)
.withTemplate(templateResource.getStream()) .withTemplate(templateResource.getStream())