oss-v1版本

yd-oss-api/src/main/java/com/yd/oss/api/controller/ApiExcelController.java

@@ -70,8 +70,8 @@ public class ApiExcelController implements ApiExcelFeignClient {
      */
      */
     @Override
     @Override
     public Result<ImportResult> importExcel(MultipartFile file, Integer headerRow,
     public Result<ImportResult> importExcel(MultipartFile file, Integer headerRow,
-                                            Integer dataStartRow, String requiredFields) {
-        return apiExcelService.importExcel(file,headerRow,dataStartRow,requiredFields);
+                                            Integer dataStartRow, String requiredFields,Integer checkStartRow) {
+        return apiExcelService.importExcel(file,headerRow,dataStartRow,requiredFields,checkStartRow);
     }
     }
 
 
     /**
     /**

yd-oss-api/src/main/java/com/yd/oss/api/service/ApiExcelService.java

@@ -21,7 +21,7 @@ public interface ApiExcelService {
     Result<ExportResult> export(List<?> dataList, ExportParam exportParam, Class<?> entityClass);
     Result<ExportResult> export(List<?> dataList, ExportParam exportParam, Class<?> entityClass);
 
 
     Result<ImportResult> importExcel(MultipartFile file, Integer headerRow,
     Result<ImportResult> importExcel(MultipartFile file, Integer headerRow,
-                                     Integer dataStartRow, String requiredFields);
+                                     Integer dataStartRow, String requiredFields,Integer checkStartRow);
 
 
     Result<ImportResult> simpleImport(MultipartFile file);
     Result<ImportResult> simpleImport(MultipartFile file);
 }
 }

yd-oss-api/src/main/java/com/yd/oss/api/service/impl/ApiExcelServiceImpl.java

@@ -107,13 +107,13 @@ public class ApiExcelServiceImpl implements ApiExcelService {
      */
      */
     @Override
     @Override
     public Result<ImportResult> importExcel(MultipartFile file, Integer headerRow,
     public Result<ImportResult> importExcel(MultipartFile file, Integer headerRow,
-                                            Integer dataStartRow, String requiredFields) {
+                                            Integer dataStartRow, String requiredFields,Integer checkStartRow) {
         List<String> requiredFieldList = null;
         List<String> requiredFieldList = null;
         if (requiredFields != null && !requiredFields.isEmpty()) {
         if (requiredFields != null && !requiredFields.isEmpty()) {
             requiredFieldList = Arrays.asList(requiredFields.split(","));
             requiredFieldList = Arrays.asList(requiredFields.split(","));
         }
         }
 
 
-        ImportResult importResult = excelImportService.genericImport(file, headerRow, dataStartRow, requiredFieldList);
+        ImportResult importResult = excelImportService.genericImport(file, headerRow, dataStartRow, requiredFieldList,checkStartRow);
         return Result.success(importResult);
         return Result.success(importResult);
     }
     }
 
 

yd-oss-feign/src/main/java/com/yd/oss/feign/client/ApiExcelFeignClient.java

@@ -62,7 +62,9 @@ public interface ApiExcelFeignClient {
             @RequestPart("file") MultipartFile file,
             @RequestPart("file") MultipartFile file,
             @RequestParam(value = "headerRow", required = false) Integer headerRow,
             @RequestParam(value = "headerRow", required = false) Integer headerRow,
             @RequestParam(value = "dataStartRow", required = false) Integer dataStartRow,
             @RequestParam(value = "dataStartRow", required = false) Integer dataStartRow,
-            @RequestParam(value = "requiredFields", required = false) String requiredFields);
+            @RequestParam(value = "requiredFields", required = false) String requiredFields,
+            @RequestParam(value = "checkStartRow", required = false) Integer checkStartRow
+    );
 
 
     /**
     /**
      * 简化导入接口
      * 简化导入接口

yd-oss-feign/src/main/java/com/yd/oss/feign/fallback/ApiExcelFeignFallbackFactory.java

@@ -40,8 +40,7 @@ public class ApiExcelFeignFallbackFactory implements FallbackFactory<ApiExcelFei
             }
             }
 
 
             @Override
             @Override
-            public Result<ImportResult> importExcel(MultipartFile file, Integer headerRow,
-                                                    Integer dataStartRow, String requiredFields) {
+            public Result<ImportResult> importExcel(MultipartFile file, Integer headerRow, Integer dataStartRow, String requiredFields, Integer checkStartRow) {
                 return null;
                 return null;
             }
             }
 
 

yd-oss-service/src/main/java/com/yd/oss/service/service/ExcelImportService.java

@@ -12,7 +12,7 @@ public interface ExcelImportService {
             MultipartFile file,
             MultipartFile file,
             Integer headerRow,
             Integer headerRow,
             Integer dataStartRow,
             Integer dataStartRow,
-            List<String> requiredFields);
+            List<String> requiredFields,Integer checkStartRow);
 
 
     ImportResult simpleImport(MultipartFile file);
     ImportResult simpleImport(MultipartFile file);
 }
 }

yd-oss-service/src/main/java/com/yd/oss/service/service/impl/ExcelImportServiceImpl.java

@@ -33,7 +33,7 @@ public class ExcelImportServiceImpl implements ExcelImportService {
     public ImportResult genericImport(MultipartFile file,
     public ImportResult genericImport(MultipartFile file,
                                       Integer headerRow,
                                       Integer headerRow,
                                       Integer dataStartRow,
                                       Integer dataStartRow,
-                                      List<String> requiredFields) {
+                                      List<String> requiredFields,Integer checkStartRow) {
 
 
         ImportResult result = new ImportResult();
         ImportResult result = new ImportResult();
 
 
@@ -66,7 +66,7 @@ public class ExcelImportServiceImpl implements ExcelImportService {
             // 4. 数据验证
             // 4. 数据验证
             if (requiredFields != null && !requiredFields.isEmpty()) {
             if (requiredFields != null && !requiredFields.isEmpty()) {
                 ValidationResult validationResult =
                 ValidationResult validationResult =
-                        validateData(data, requiredFields, dataStartRowNum);  // 传入dataStartRowNum
+                        validateData(data, requiredFields, dataStartRowNum,checkStartRow);  // 传入dataStartRowNum
                 result.setValid(validationResult.isValid());
                 result.setValid(validationResult.isValid());
                 result.setErrorMessages(validationResult.getErrors());
                 result.setErrorMessages(validationResult.getErrors());
             } else {
             } else {
@@ -96,7 +96,7 @@ public class ExcelImportServiceImpl implements ExcelImportService {
      */
      */
     @Override
     @Override
     public ImportResult simpleImport(MultipartFile file) {
     public ImportResult simpleImport(MultipartFile file) {
-        return genericImport(file, 0, 1, null);
+        return genericImport(file, 0, 1, null,null);
     }
     }
 
 
     /**
     /**
@@ -278,13 +278,14 @@ public class ExcelImportServiceImpl implements ExcelImportService {
      */
      */
     public static ValidationResult validateData(List<Map<String, Object>> data,
     public static ValidationResult validateData(List<Map<String, Object>> data,
                                                 List<String> requiredFields,
                                                 List<String> requiredFields,
-                                                int dataStartRow) {  // 新增参数
+                                                int dataStartRow,Integer checkStartRow) {  // 新增参数
         ValidationResult result = new ValidationResult();
         ValidationResult result = new ValidationResult();
         result.setValid(true);
         result.setValid(true);
 
 
         for (int i = 0; i < data.size(); i++) {
         for (int i = 0; i < data.size(); i++) {
             Map<String, Object> row = data.get(i);
             Map<String, Object> row = data.get(i);
-            int excelRowNum = dataStartRow + i + 1; // 计算Excel中的实际行号
+//            int excelRowNum = dataStartRow + i + 1; // 计算Excel中的实际行号
+            Integer excelRowNum = checkStartRow + i; // 计算Excel中的实际行号
 
 
             // 检查必填字段
             // 检查必填字段
             for (String field : requiredFields) {
             for (String field : requiredFields) {