|
|
|
@ -195,10 +195,15 @@ public class RootCloudIotDataFormatterJob { |
|
|
|
machineIotDataReceivedEvent.setMachineIotMac(Long.valueOf(event.get__assetId__())); |
|
|
|
machineIotDataReceivedEvent.setDataSource(DataSource.ROOT_CLOUD); |
|
|
|
machineIotDataReceivedEvent.setMachinePwrStat(event.getPWR_sta()); |
|
|
|
machineIotDataReceivedEvent.setMachineWorkingStat(event.getWorking_sta()); |
|
|
|
machineIotDataReceivedEvent.setIgStat(event.getIG_sta()); |
|
|
|
machineIotDataReceivedEvent.setAccJobCount(event.getACC_count_total()); |
|
|
|
machineIotDataReceivedEvent.setCurrJobCount(event.getACC_count()); |
|
|
|
Long accCount = event.getACC_count(); |
|
|
|
machineIotDataReceivedEvent.setCurrJobCount(accCount); |
|
|
|
if(accCount == 0) { |
|
|
|
machineIotDataReceivedEvent.setMachineWorkingStat(event.getWorking_sta()); |
|
|
|
}else { |
|
|
|
machineIotDataReceivedEvent.setMachineWorkingStat(event.getWorking_sta()); |
|
|
|
} |
|
|
|
machineIotDataReceivedEvent.setCurrJobDuration(Objects.isNull(event.getRunning_duration()) ? null : event.getRunning_duration().longValue()); |
|
|
|
if (StringUtils.isNotBlank(event.getStoping_duration())) { |
|
|
|
BigDecimal stoppingDuration = new BigDecimal(event.getStoping_duration()); |
|
|
|
|