update 会员项目导入导出

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java

@@ -10,6 +10,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -187,7 +188,7 @@ public class JeroController<T, S extends IService<T>> {
      * @param request
      * @return
      */
-    protected List<T> getExcelData(HttpServletRequest request, Class<T> clazz) {
+    protected List<Object> getExcelData(HttpServletRequest request, Class<?> clazz) {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -207,6 +208,11 @@ public class JeroController<T, S extends IService<T>> {
             params.setTitleRows(1);
             params.setHeadRows(1);
             try {
+                //导入Excel格式校验，看匹配的字段文本概率
+                Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), clazz, params);
+                if(!t){
+                    throw new JeroBootException("导入Excel校验失败 ！");
+                }
                 return ExcelImportUtil.importExcel(file.getInputStream(), clazz, params);
             } catch (Exception e) {
                 throw new JeroBootException("文件导入失败:" + e.getMessage());