Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGGSZK260DataManagerImpl.java =================================================================== diff -u -r41160 -r41161 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGGSZK260DataManagerImpl.java (.../MargeMAGGSZK260DataManagerImpl.java) (revision 41160) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGGSZK260DataManagerImpl.java (.../MargeMAGGSZK260DataManagerImpl.java) (revision 41161) @@ -229,13 +229,16 @@ } String[] split = line.split("\t"); if(split.length != 37){ - - throw new SystemException("文件内容格式异常,正常文件字段个数为37,当前文件字段个数为" + split.length); + continue; } + int i = 0; + String serialNumber = split[++i].trim(); + if("0".equals(serialNumber) || StringUtils.isBlank(serialNumber)){ + continue; + } WashDataOfMAGGSZK260 washData = new WashDataOfMAGGSZK260(); washData.setDeviceInterfaceID(devInterface.getId()); washData.setMachineNo(machineNo); - int i = 0; washData.setSerialNumber(split[++i].trim()); washData.setStartYear(split[++i].trim()); washData.setStartMonth(split[++i].trim());