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 cd477c5..395d300 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 @@ -238,16 +238,15 @@ public class IotMachineEventGeneratorJob { } } } - if ((event.getCurrJobCount() != 0 && event.getCurrJobDuration() != 0) - || (event.getCurrJobCount() == 0 && event.getCurrJobDuration() == 0)) { + if(!(workingSta == 1 && event.getCurrJobCount() == 0)) { MachineIotDataReceivedEvent receivedEvent = collDeviceStatusChange(out, deviceState, lastDataReceivedEvent, event); if (receivedEvent != null) { ctx.output(machineIotDataReceivedEventOutput, event); } - lastDataReceivedEventState.update(event); } } } + lastDataReceivedEventState.update(event); } }).name("keyBy stream");