|
|
|
@ -186,12 +186,7 @@ public class RootCloudIotDataFormatterJob { |
|
|
|
receivedEvent.setDataSource(DataSource.ROOT_CLOUD); |
|
|
|
receivedEvent.setMachineIotMac(machineIotMac); |
|
|
|
receivedEvent.setMachinePwrStat(pwrSta); |
|
|
|
if (pwrSta == 1 && accCount != null && accCount == 0) { |
|
|
|
// 如果是开机状态并且没有产量就设置为待机 |
|
|
|
receivedEvent.setMachineWorkingStat(2); |
|
|
|
} else { |
|
|
|
receivedEvent.setMachineWorkingStat(workingSta); |
|
|
|
} |
|
|
|
receivedEvent.setMachineWorkingStat(workingSta); |
|
|
|
receivedEvent.setAccJobCount(accCount); |
|
|
|
if ((pwrSta == 1 && workingSta == 1) |
|
|
|
|| (lastPwrStat == 1 && lastWorkingStat == 1)) { |
|
|
|
|