From fd73074d15b382a7d90b13c53b68b73606a7f972 Mon Sep 17 00:00:00 2001
From: "1049970895@qniao.cn" <1049970895>
Date: Sat, 20 Aug 2022 09:58:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/generator/job/IotMachineEventGeneratorJob.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java b/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java
index bd70535..043da93 100644
--- a/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java
+++ b/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java
@@ -349,10 +349,10 @@ public class IotMachineEventGeneratorJob {
             // 设备关机
             out.collect(event);
         } else if (oldState.getStatus() == 1 && newState.getStatus() == 2) {
-            // 设备开始待机
+            // 设备待机中
             out.collect(event);
-        } else if (oldState.getStatus() == 2 && newState.getStatus() == 1) {
-            // 设备开始工作
+        } else if ((oldState.getStatus() == 2 || oldState.getStatus() == 1) && newState.getStatus() == 1) {
+            // 设备工作中
             out.collect(event);
         }
     }