From a2b901a85407dfbf01bd44051d447f3dde7d6d07 Mon Sep 17 00:00:00 2001
From: "1049970895@qniao.cn" <1049970895>
Date: Wed, 14 Sep 2022 10:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/IotMachineEventGeneratorJob.java      | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 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 a77a593..b850a4f 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
@@ -134,14 +134,29 @@ public class IotMachineEventGeneratorJob {
                     @Override
                     public boolean filter(MachineIotDataReceivedEvent value) {
 
-                        Long currCount = value.getCurrJobCount();
+
+                        Integer dataSource = value.getDataSource();
                         Integer machineWorkingStat = value.getMachineWorkingStat();
                         boolean bool = false;
-                        if (currCount == null) {
-                            currCount = 0L;
-                        }
-                        if (machineWorkingStat != null) {
-                            bool = !(machineWorkingStat == 1 && currCount == 0);
+                        if(dataSource != null) {
+                            if(dataSource == 1) {
+                                // 树根
+                                Long countOfThePeriod = value.getCountOfThePeriod();
+                                if(countOfThePeriod == null) {
+                                    countOfThePeriod = 0L;
+                                }
+                                bool = !(machineWorkingStat == 1 && countOfThePeriod == 0);
+                            }
+                            if(dataSource == 0) {
+                                // 机智云
+                                Long currCount = value.getCurrJobCount();
+                                if (currCount == null) {
+                                    currCount = 0L;
+                                }
+                                bool = !(machineWorkingStat == 1 && currCount == 0);
+                            }
+                        }else {
+                            return false;
                         }
                         if (bool && value.getMachinePwrStat() != null
                                 && value.getMachineIotMac() != null