|
|
|
@ -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{ |
|
|
|
|