|
|
|
@ -194,13 +194,15 @@ public class RootCloudIotDataFormatterJob { |
|
|
|
machineIotDataReceivedEvent.setId(snowflake.nextId()); |
|
|
|
machineIotDataReceivedEvent.setMachineIotMac(Long.valueOf(event.get__assetId__())); |
|
|
|
machineIotDataReceivedEvent.setDataSource(DataSource.ROOT_CLOUD); |
|
|
|
machineIotDataReceivedEvent.setMachinePwrStat(event.getPWR_sta()); |
|
|
|
Integer pwrSta = event.getPWR_sta(); |
|
|
|
machineIotDataReceivedEvent.setMachinePwrStat(pwrSta); |
|
|
|
machineIotDataReceivedEvent.setIgStat(event.getIG_sta()); |
|
|
|
machineIotDataReceivedEvent.setAccJobCount(event.getACC_count_total()); |
|
|
|
Long accCount = event.getACC_count(); |
|
|
|
machineIotDataReceivedEvent.setCurrJobCount(accCount); |
|
|
|
if(accCount == 0) { |
|
|
|
machineIotDataReceivedEvent.setMachineWorkingStat(event.getWorking_sta()); |
|
|
|
if(pwrSta == 1 && accCount == 0) { |
|
|
|
// 如果是开机状态并且没有产量就设置为待机 |
|
|
|
machineIotDataReceivedEvent.setMachineWorkingStat(2); |
|
|
|
}else { |
|
|
|
machineIotDataReceivedEvent.setMachineWorkingStat(event.getWorking_sta()); |
|
|
|
} |
|
|
|
|