更新

iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java

@@ -228,12 +228,13 @@ public class GizWitsIotDataFormatterJob {
                     machineIotDataReceivedEvent.setDataSource(DataSource.TACT_CLOUD);
                     machineIotDataReceivedEvent.setMachineIotMac(Long.valueOf(deviceStatus.getMac()));
                     machineIotDataReceivedEvent.setMachinePwrStat(1);
-                    if (deviceStatus.getTimestamp() == null) {
+                    Long count = deviceStatus.getCount();
+                    if (count == null || count == 0) {
                         machineIotDataReceivedEvent.setMachineWorkingStat(2);
                     } else {
                         machineIotDataReceivedEvent.setMachineWorkingStat(1);
                     }
-                    machineIotDataReceivedEvent.setCurrJobCount(deviceStatus.getCount());
+                    machineIotDataReceivedEvent.setCurrJobCount(count);
                     machineIotDataReceivedEvent.setCurrJobDuration(deviceStatus.getDuration());
                     machineIotDataReceivedEvent.setCurrStoppingDuration(0L);
                     machineIotDataReceivedEvent.setCurrWaitingDuration(0L);