diff --git a/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java b/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java index d92be8f..5e9c1a5 100644 --- a/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java +++ b/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java @@ -424,13 +424,13 @@ public class ModbusCollectServiceImpl logger.info("正常中间表发送状态{},sfdcid{}", resourceScheduled.getIssend(),resourceScheduled.getSfdcid()); if(StringUtils.isNotBlank(resourceScheduled.getIssend()) && updateResourceScheduled.getSfdcid() != null){ SfdcTimeHist sfdcTimeHist = new SfdcTimeHist(); - sfdcTimeHist.setId(resourceScheduled.getSfdcid()); + sfdcTimeHist.setId(updateResourceScheduled.getSfdcid()); sfdcTimeHist.setSite(folderLocation.getSite()); sfdcTimeHist.setTillTime(new Date()); sfdcTimeHist.setTillenteredTime(new Date()); sfdcTimeHist.setCompletedFlag("Y"); sfdcTimeHistMapper.updatesfdcTimeHistById(sfdcTimeHist); - logger.info("更新了sfdc表,变为Y,id:{}",resourceScheduled.getSfdcid()); + logger.info("更新了sfdc表,completedFlaf变为{},id:{}",sfdcTimeHist.getCompletedFlag(),updateResourceScheduled.getSfdcid()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("site", folderLocation.getSite()); @@ -439,7 +439,7 @@ public class ModbusCollectServiceImpl updateWrapper.set("issend", null); updateWrapper.set("sfdcid",null); resourceScheduledMapper.update(updateWrapper); - logger.info("更新了中间表,变为null,id:{}",resourceScheduled.getId()); + logger.info("更新了中间表,变为null,id:{}",resourceScheduled.getSfdcid()); } } }else{