1

src/main/java/com/cdf/service/impl/ExcelService.java

@@ -356,8 +356,15 @@ public class ExcelService {
     }
 
     private void uploadOutline(File file) {
+        List<String> errorList = new ArrayList<>();
+        this.checkUploadOutline(file,errorList);
+        Integer colum = 1;
         List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
         for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            if(errorList.contains(colum.toString())){
+                continue;
+            }
             String outlineId = map.get(0);
             String brandId = map.get(1);
             if(StringUtils.isNotBlank(outlineId) && StringUtils.isNotBlank(brandId)){
@@ -368,9 +375,16 @@ public class ExcelService {
     }
 
     private void uploadProduct(File file) {
+        List<String> errorList = new ArrayList<>();
+        this.checkUploadProduct(file,errorList);
+        Integer colum = 1;
         List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
         HashMap<String,HashMap<String,HashSet<String>>> numMap = new HashMap<>();
         for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            if(errorList.contains(colum.toString())){
+                continue;
+            }
             String sceneNum = map.get(0);
             String sid = map.get(1);
             String title = map.get(2);
@@ -407,10 +421,16 @@ public class ExcelService {
     }
 
     private void uploadHot(File file,Integer type) {
-
+        List<String> errorList = new ArrayList<>();
+        this.checkHot(file,errorList);
+        Integer colum = 1;
         List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
         HashMap<String,HashSet<String>> numMap = new HashMap<>();
         for (HashMap<Integer, String> map : excelRowList) {
+            colum ++;
+            if(errorList.contains(colum.toString())){
+                continue;
+            }
             String sceneNum = map.get(0);
             String sid = map.get(1);
             String title = map.get(2);