From 9d34673fdc44d35f27cc8591211fa22b07628061 Mon Sep 17 00:00:00 2001
From: "hupenghui@qniao.cn" <1049970895>
Date: Wed, 24 Aug 2022 22:27:00 +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

---
 .../java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java b/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java
index 9bb805e..834a137 100644
--- a/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java
+++ b/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java
@@ -200,7 +200,7 @@ public class RootCloudIotDataFormatterJob {
             machineIotDataReceivedEvent.setAccJobCount(event.getACC_count_total());
             Long accCount = event.getACC_count();
             machineIotDataReceivedEvent.setCurrJobCount(accCount);
-            if(pwrSta == 1 && accCount == 0) {
+            if(pwrSta != null && pwrSta == 1 && accCount != null && accCount == 0) {
                 // 如果是开机状态并且没有产量就设置为待机
                 machineIotDataReceivedEvent.setMachineWorkingStat(2);
             }else {