Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java =================================================================== diff -u -r29649 -r29650 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 29649) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 29650) @@ -230,11 +230,11 @@ if(lowTempForJohnsonSterilizerRecord == null){ continue; } - Long cycleCounter = lowTempForJohnsonSterilizerRecord.getCycleCounter(); - if(cycleCounter == null){ + Long totalCycleCounter = lowTempForJohnsonSterilizerRecord.getTotalCycleCounter(); + if(totalCycleCounter == null){ continue; } - if(isExistData(cycleCounter, machineNumber, machineNumberCycleCounterSet)){ + if(isExistData(totalCycleCounter, machineNumber, machineNumberCycleCounterSet)){ continue; } lowTempForJohnsonSterilizerRecord.setMachineNumber(machineNumber); @@ -372,13 +372,13 @@ * @param machineNumberCycleCounterSet 已读取的循环次数_机器号 * @return */ - private boolean isExistData(Long cycleCounter, String machineNumber, Set machineNumberCycleCounterSet){ - if(machineNumberCycleCounterSet.contains(cycleCounter+"_"+machineNumber)){//第一层验证,已读取的数据不再读取 + private boolean isExistData(Long totalCycleCounter, String machineNumber, Set machineNumberCycleCounterSet){ + if(machineNumberCycleCounterSet.contains(totalCycleCounter+"_"+machineNumber)){//第一层验证,已读取的数据不再读取 return true;//文件有数据重复,已读取的炉次,不再读取 - }else if(isExistData(machineNumber, cycleCounter)){//第二层验证,已保存到的数据库的数据不再保存 + }else if(isExistData(machineNumber, totalCycleCounter)){//第二层验证,已保存到的数据库的数据不再保存 return true; } - machineNumberCycleCounterSet.add(cycleCounter+"_"+machineNumber); + machineNumberCycleCounterSet.add(totalCycleCounter+"_"+machineNumber); return false; } /** @@ -399,9 +399,9 @@ * @param cycleCounter 循环次数 * @return */ - private boolean isExistData(String machineNumber, Long cycleCounter){ + private boolean isExistData(String machineNumber, Long totalCycleCounter){ String sql = String.format("select count(*) from %s where machineNumber='%s' and totalCycleCounter=%s ", - LowTempForJohnsonSterilizerRecord.class.getSimpleName(),machineNumber,cycleCounter); + LowTempForJohnsonSterilizerRecord.class.getSimpleName(),machineNumber,totalCycleCounter); if(objectDao.countBySql(sql) > 0){ return true; }