From 66d7975674957f12876371af5fc651978816b742 Mon Sep 17 00:00:00 2001
From: "hupenghui@qniao.cn" <1049970895>
Date: Mon, 15 Aug 2022 00:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java b/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java
index 29fd239..d35a03a 100644
--- a/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/GizWitsIotDataFormatterJob.java
+++ b/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);