diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlExportUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlToExcelUtil.java similarity index 67% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlExportUtil.java rename to easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlToExcelUtil.java index 4caf7bf..6f96ad7 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlExportUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlToExcelUtil.java @@ -15,20 +15,26 @@ */ package org.jeecgframework.poi.excel; +import java.io.IOException; +import java.io.InputStream; + import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.html.HtmlToExcelServer; +import org.jeecgframework.poi.exception.excel.ExcelExportException; +import org.jeecgframework.poi.exception.excel.enums.ExcelExportEnum; /** * 基于Excel和Html的互换 * @author JueYue * 2017年3月27日 */ -public class HtmlExportUtil { +public final class HtmlToExcelUtil { - private HtmlExportUtil() { + private HtmlToExcelUtil() { } @@ -43,4 +49,12 @@ public class HtmlExportUtil { return workbook; } + public static Workbook htmlToExcel(InputStream is, ExcelType type) { + try { + return htmlToExcel(new String(IOUtils.toByteArray(is)), type); + } catch (IOException e) { + throw new ExcelExportException(ExcelExportEnum.HTML_ERROR, e); + } + } + } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.java b/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.java index 7e1395e..536f0ec 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.java @@ -24,6 +24,7 @@ public enum ExcelExportEnum { PARAMETER_ERROR ("Excel 导出 参数错误") , EXPORT_ERROR ("Excel导出错误") , + HTML_ERROR ("Excel导出Html流错误") , TEMPLATE_ERROR ("Excel 模板错误"); private String msg;