|
|
@ -135,14 +135,9 @@ public class IotMachineEventGeneratorJob { |
|
|
@Override |
|
|
@Override |
|
|
public boolean filter(MachineIotDataReceivedEvent value) { |
|
|
public boolean filter(MachineIotDataReceivedEvent value) { |
|
|
|
|
|
|
|
|
Integer dataSource = value.getDataSource(); |
|
|
|
|
|
boolean bool = true; |
|
|
|
|
|
if (DataSource.TACT_CLOUD.equals(dataSource)) { |
|
|
|
|
|
// 机智云(树根的校验不了) |
|
|
|
|
|
Long currCount = value.getCurrJobCount(); |
|
|
|
|
|
Integer machineWorkingStat = value.getMachineWorkingStat(); |
|
|
|
|
|
bool = !(machineWorkingStat == 2 && currCount == 0); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
Long currCount = value.getCurrJobCount(); |
|
|
|
|
|
Integer machineWorkingStat = value.getMachineWorkingStat(); |
|
|
|
|
|
boolean bool = !(machineWorkingStat == 2 && currCount == 0); |
|
|
if (bool && value.getMachinePwrStat() != null |
|
|
if (bool && value.getMachinePwrStat() != null |
|
|
&& value.getMachineIotMac() != null |
|
|
&& value.getMachineIotMac() != null |
|
|
&& value.getMachineWorkingStat() != null && value.getReportTime() != null) { |
|
|
&& value.getMachineWorkingStat() != null && value.getReportTime() != null) { |
|
|
|