fix bug 41173 导入--导入图片后的提示语有误。

This commit is contained in:
lijiarao
2021-10-21 14:59:00 +08:00
parent 37cd9b1acc
commit 6244356d3a
5 changed files with 24 additions and 0 deletions
@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.ImportExcelUtil;
import com.jero.modules.quartz.entity.QuartzJob;
@@ -236,6 +237,10 @@ public class QuartzJobController {
int successLines = 0, errorLines = 0;
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
// 校验文件是否为excel
if(!ImportExcelUtil.checkExcelFile(file)){
throw new JeroBootException("请导入excel文件!");
}
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
@@ -11,7 +11,9 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.ImportExcelUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -370,6 +372,10 @@ public class SysAnnouncementController {
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
// 校验文件是否为excel
if(!ImportExcelUtil.checkExcelFile(file)){
throw new JeroBootException("请导入excel文件!");
}
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
@@ -392,6 +392,10 @@ public class SysDepartController {
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
// 校验文件是否为excel
if(!ImportExcelUtil.checkExcelFile(file)){
throw new JeroBootException("请导入excel文件!");
}
ImportParams params = new ImportParams();
params.setTitleRows(1);
params.setHeadRows(1);
@@ -13,6 +13,7 @@ import cn.hutool.core.util.StrUtil;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.SysDepartTreeModel;
import com.jero.common.system.vo.SysRoleTreeModel;
import com.jero.common.util.ImportExcelUtil;
import com.jero.modules.system.entity.*;
import com.jero.modules.system.service.*;
import io.swagger.annotations.ApiOperation;
@@ -333,6 +334,10 @@ public class SysRoleController {
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
// 校验文件是否为excel
if(!ImportExcelUtil.checkExcelFile(file)){
throw new JeroBootException("请导入excel文件!");
}
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
@@ -719,6 +719,10 @@ public class SysUserController {
int successLines = 0, errorLines = 0;
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
// 校验文件是否为excel
if(!ImportExcelUtil.checkExcelFile(file)){
throw new JeroBootException("请导入excel文件!");
}
ImportParams params = new ImportParams();
params.setTitleRows(1);
params.setHeadRows(1);