diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs index 91377ac..14b697b 100644 --- a/.settings/org.eclipse.m2e.core.prefs +++ b/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles=cc-mzone-profile +activeProfiles= eclipse.preferences.version=1 resolveWorkspaceProjects=true version=1 diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/BigExcelExportView.java b/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/BigExcelExportView.java index a60c88c..ecf4963 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/BigExcelExportView.java +++ b/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/BigExcelExportView.java @@ -15,7 +15,6 @@ */ package org.jeecgframework.poi.excel.view; -import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.vo.BigExcelConstants; diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PoiBaseView.java b/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PoiBaseView.java index f558e71..8c6f391 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PoiBaseView.java +++ b/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PoiBaseView.java @@ -15,21 +15,45 @@ */ package org.jeecgframework.poi.excel.view; +import java.util.Map; + import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecgframework.poi.excel.entity.vo.BigExcelConstants; +import org.jeecgframework.poi.excel.entity.vo.MapExcelConstants; +import org.jeecgframework.poi.excel.entity.vo.MapExcelGraphConstants; +import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; import org.springframework.web.servlet.view.AbstractView; /** * 提供一些通用结构 */ public abstract class PoiBaseView extends AbstractView { - - - protected boolean isIE(HttpServletRequest request) { + + protected static boolean isIE(HttpServletRequest request) { return (request.getHeader("USER-AGENT").toLowerCase().indexOf("msie") > 0 || request.getHeader("USER-AGENT").toLowerCase().indexOf("rv:11.0") > 0 || request.getHeader("USER-AGENT").toLowerCase().indexOf("edge") > 0) ? true : false; } + public static void render(Map model, HttpServletRequest request, + HttpServletResponse response, String viewName) throws Exception { + PoiBaseView view = null; + if (BigExcelConstants.BIG_EXCEL_VIEW.equals(viewName)) { + view = new BigExcelExportView(); + } else if (MapExcelConstants.JEECG_MAP_EXCEL_VIEW.equals(viewName)) { + view = new JeecgMapExcelView(); + } else if (NormalExcelConstants.JEECG_EXCEL_VIEW.equals(viewName)) { + view = new JeecgSingleExcelView(); + } else if (TemplateExcelConstants.JEECG_TEMPLATE_EXCEL_VIEW.equals(viewName)) { + view = new JeecgTemplateExcelView(); + } else if (MapExcelGraphConstants.MAP_GRAPH_EXCEL_VIEW.equals(viewName)) { + view = new MapGraphExcelView(); + } + view.renderMergedOutputModel(model, request, response); + } + }