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); } }