diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java index 10cff5cd..dc052c2f 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java @@ -128,7 +128,15 @@ public class ${table.getCName()}Ajax{ public Object imports(MultipartFile file) { BaseResponse baseResponse = new BaseResponse(); try { - WExcel sheet = new WExcel<>(${table.getCName()}.class).read(file.getBytes(), new WExcel.Processor<${table.getCName()}>() { + // 检查文件格式 + String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; + if (!originalFilename.matches("\\.xlsx?")) { + baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); + return baseResponse; + } + // 兼容2003以前老版本.xls + ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS; + WExcel sheet = new WExcel<>(${table.getCName()}.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<${table.getCName()}>() { @Override public List exec(${table.getCName()} o, int index) { ${table.getCName()}CreateRequest request = MapperUtil.map(o, ${table.getCName()}CreateRequest.class); @@ -144,7 +152,7 @@ public class ${table.getCName()}Ajax{ return validate; } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java index ec2f51aa..cf03925d 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java @@ -73,7 +73,7 @@ public class DeptAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -86,7 +86,7 @@ public class DeptAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java index e2df18be..693eaed0 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java @@ -73,7 +73,7 @@ public class DictAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -86,7 +86,7 @@ public class DictAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java index 826ac2f7..8743e097 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java @@ -67,7 +67,7 @@ public class DictItemAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -80,7 +80,7 @@ public class DictItemAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java index d17f779e..fff5119b 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java @@ -67,7 +67,7 @@ public class FileAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -80,7 +80,7 @@ public class FileAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java index 49fb89a0..bd0d2eab 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java @@ -67,7 +67,7 @@ public class ProfilesAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -80,7 +80,7 @@ public class ProfilesAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java index 7ee5a461..270838b0 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java @@ -73,7 +73,7 @@ public class ResAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -86,7 +86,7 @@ public class ResAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java index 5d1e7548..7daf7b76 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java @@ -73,7 +73,7 @@ public class RoleAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -86,7 +86,7 @@ public class RoleAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java index 4164840f..a5e43108 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java @@ -67,7 +67,7 @@ public class TaskSqlAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -80,7 +80,7 @@ public class TaskSqlAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java index 2563f5ec..700c6635 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java @@ -124,7 +124,7 @@ public class UserAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -137,7 +137,7 @@ public class UserAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java index 048d9bd3..c56d4085 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java @@ -67,7 +67,7 @@ public class VisitorAjax { try { // 检查文件格式 String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; - if (originalFilename.matches("\\.xlsx?")) { + if (!originalFilename.matches("\\.xlsx?")) { baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误!"); return baseResponse; } @@ -80,7 +80,7 @@ public class VisitorAjax { return ValidationUtil.validate(request); } }); - + // 当导入出现错误时可以将存在标注错误的Excel返回给用户改正 if (sheet.hasError()) { return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); } else { diff --git a/src/main/resources/modules/SpringBoot/resources/static/css/base.css b/src/main/resources/modules/SpringBoot/resources/static/css/base.css index 883435c6..63da00d9 100644 --- a/src/main/resources/modules/SpringBoot/resources/static/css/base.css +++ b/src/main/resources/modules/SpringBoot/resources/static/css/base.css @@ -717,6 +717,7 @@ code { [class^=el-tooltip], [class^=el-dropdown], [class^=el-drawer], +[class^=el-card], [class^=el-button]{ border-radius: 0!important; }