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 a4d0e8d..57ff5a7 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 @@ -206,9 +206,14 @@ public class IotMachineEventGeneratorJob { // 只有当前是工作中或上次是工作中才进行计算 // 如果这次的消息和上次的消息相差半个小时,那么不进行计算 if (reportTime - lastReportTime <= 30 * 60 * 1000) { - event.setCurrCount(accCount - lastAccJobCount); - // 单位是秒 - event.setCurrDuration((reportTime - lastReportTime) / 3600); + // 判断是否是机智云还是树根 + Integer dataSource = event.getDataSource(); + if(dataSource == 1) { + // 树根的需要计算 + event.setCurrCount(accCount - lastAccJobCount); + // 单位是秒 + event.setCurrDuration((reportTime - lastReportTime) / 3600); + } } } ctx.output(machineIotDataReceivedEventOutput, event);