lyhzzz %!s(int64=2) %!d(string=hai) anos
pai
achega
2fab55a577

+ 21 - 3
src/main/java/com/fdkankan/manage/service/impl/ExcelServiceImpl.java

@@ -94,19 +94,31 @@ public class ExcelServiceImpl implements IExcelService {
         for (HashMap<Integer, String> map : excelRowList) {
         for (HashMap<Integer, String> map : excelRowList) {
             index ++;
             index ++;
             if(type == 0){      //入库
             if(type == 0){      //入库
+                if(!map.get(0).equals("设备入库模板")){
+                    throw new BusinessException(ResultCode.TEMPLATE_TYPE_ERROR);
+                }
+                if(index <4){   //从第四行开始
+                    continue;
+                }
                 String wifiName = map.get(0);
                 String wifiName = map.get(0);
                 if(StringUtils.isBlank(wifiName)){
                 if(StringUtils.isBlank(wifiName)){
-                    errorIndex.add(index);
+                    errorIndex.add(index -3);
                 }
                 }
                 wifiNameList.add(wifiName);
                 wifiNameList.add(wifiName);
             }else if(type == 1){    //出库
             }else if(type == 1){    //出库
+                if(!map.get(0).equals("设备出库模板")){
+                    throw new BusinessException(ResultCode.TEMPLATE_TYPE_ERROR);
+                }
+                if(index <4){
+                    continue;
+                }
                 String snCode = map.get(0);
                 String snCode = map.get(0);
                 String outTypeString = map.get(1);
                 String outTypeString = map.get(1);
                 String companyName = map.get(2);
                 String companyName = map.get(2);
                 String orderSn = map.get(3);
                 String orderSn = map.get(3);
                 CameraOutTypeEnum outTypeEnum = CameraOutTypeEnum.getByMsg(outTypeString);
                 CameraOutTypeEnum outTypeEnum = CameraOutTypeEnum.getByMsg(outTypeString);
                 if(outTypeEnum == null || StringUtils.isBlank(snCode)){
                 if(outTypeEnum == null || StringUtils.isBlank(snCode)){
-                    errorIndex.add(index );
+                    errorIndex.add(index -3);
                 }
                 }
                 int outType = outTypeEnum.getCode();
                 int outType = outTypeEnum.getCode();
                 CameraInOutParam param = new CameraInOutParam();
                 CameraInOutParam param = new CameraInOutParam();
@@ -116,11 +128,17 @@ public class ExcelServiceImpl implements IExcelService {
                 param.setSnCode(snCode);
                 param.setSnCode(snCode);
                 params.add(param);
                 params.add(param);
             }else if(type == 2){   //关联客户
             }else if(type == 2){   //关联客户
+                if(!map.get(0).equals("客户关联模板")){
+                    throw new BusinessException(ResultCode.TEMPLATE_TYPE_ERROR);
+                }
+                if(index <4){
+                    continue;
+                }
                 CameraInOutParam param = new CameraInOutParam();
                 CameraInOutParam param = new CameraInOutParam();
                 param.setCompanyName(map.get(0));
                 param.setCompanyName(map.get(0));
                 param.setSnCode(map.get(1));
                 param.setSnCode(map.get(1));
                 if(StringUtils.isBlank(param.getSnCode()) || StringUtils.isBlank(param.getCompanyName())){
                 if(StringUtils.isBlank(param.getSnCode()) || StringUtils.isBlank(param.getCompanyName())){
-                    errorIndex.add(index );
+                    errorIndex.add(index -3 );
                 }
                 }
                 companyParams.add(param);
                 companyParams.add(param);
             }
             }

+ 1 - 1
src/main/java/com/fdkankan/manage/util/ExcelUtil.java

@@ -24,7 +24,7 @@ public class ExcelUtil {
             throw new IOException("创建Sheet失败!");
             throw new IOException("创建Sheet失败!");
         }
         }
         //开始遍历行
         //开始遍历行
-        for (int i=3;i<= sheet.getLastRowNum();i++){
+        for (int i=0;i<= sheet.getLastRowNum();i++){
             Row row = sheet.getRow(i);
             Row row = sheet.getRow(i);
             //列List
             //列List
             HashMap<Integer,String> map = new HashMap<>();
             HashMap<Integer,String> map = new HashMap<>();