|
|
@ -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); |
|
|
MachineIotDataReceivedEvent receivedEvent = collDeviceStatusChange(out, deviceState, lastDataReceivedEvent, event); |
|
|
if (receivedEvent != null) { |
|
|
if (receivedEvent != null) { |
|
|
ctx.output(machineIotDataReceivedEventOutput, event); |
|
|
ctx.output(machineIotDataReceivedEventOutput, event); |
|
|
} |
|
|
} |
|
|
lastDataReceivedEventState.update(event); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
lastDataReceivedEventState.update(event); |
|
|
} |
|
|
} |
|
|
}).name("keyBy stream"); |
|
|
}).name("keyBy stream"); |
|
|
|
|
|
|
|
|
|