From 7187b11205fea7ba4d9da6d7490c4c47c8b5362d Mon Sep 17 00:00:00 2001 From: "hupenghui@qniao.cn" <1049970895> Date: Wed, 24 Aug 2022 21:40:15 +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 --- .../com/qniao/iot/rc/RootCloudIotDataFormatterJob.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java b/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java index 89fe9c7..9bb805e 100644 --- a/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java +++ b/root-cloud-statistics/src/main/java/com/qniao/iot/rc/RootCloudIotDataFormatterJob.java @@ -194,13 +194,15 @@ public class RootCloudIotDataFormatterJob { machineIotDataReceivedEvent.setId(snowflake.nextId()); machineIotDataReceivedEvent.setMachineIotMac(Long.valueOf(event.get__assetId__())); machineIotDataReceivedEvent.setDataSource(DataSource.ROOT_CLOUD); - machineIotDataReceivedEvent.setMachinePwrStat(event.getPWR_sta()); + Integer pwrSta = event.getPWR_sta(); + machineIotDataReceivedEvent.setMachinePwrStat(pwrSta); machineIotDataReceivedEvent.setIgStat(event.getIG_sta()); machineIotDataReceivedEvent.setAccJobCount(event.getACC_count_total()); Long accCount = event.getACC_count(); machineIotDataReceivedEvent.setCurrJobCount(accCount); - if(accCount == 0) { - machineIotDataReceivedEvent.setMachineWorkingStat(event.getWorking_sta()); + if(pwrSta == 1 && accCount == 0) { + // 如果是开机状态并且没有产量就设置为待机 + machineIotDataReceivedEvent.setMachineWorkingStat(2); }else { machineIotDataReceivedEvent.setMachineWorkingStat(event.getWorking_sta()); }