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 03520a3..b5b7e61 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 @@ -1047,7 +1047,7 @@ public class ModbusCollectServiceImpl if(!downlogChangeLast.getSeqNo().equals(resourceScheduled.getSeqNo())){ SfdcTimeHist sfdcTimeHistNew = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), downlogChangeLast.getSeqNo(), "自动停机"); if(sfdcTimeHistNew != null && "Y".equals(sfdcTimeHistNew.getCompletedFlag())){ - ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), resourceScheduled.getSeqNo()); + ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), downlogChangeLast.getSeqNo()); if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){ downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc()+"(手动结束停机)"); }else{