From e2d0d49f30d966ceea37eab3906c8d20b643e699 Mon Sep 17 00:00:00 2001 From: "1049970895@qniao.cn" <1049970895> Date: Mon, 5 Sep 2022 19:12:26 +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 | 7 ++++--- 1 file changed, 4 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 0332d6f..cfc8079 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 @@ -205,7 +205,8 @@ public class RootCloudIotDataFormatterJob { machineIotDataReceivedEvent.setCurrCount(0L); machineIotDataReceivedEvent.setCurrDuration(0L); machineIotDataReceivedEvent.setDurationOfThePeriod(0L); - machineIotDataReceivedEvent.setCountOfThePeriod(0L); + // 树根的getACC_count每次关机就会清0，所以应该是一个周期的产量 + machineIotDataReceivedEvent.setCountOfThePeriod(event.getACC_count()); machineIotDataReceivedEvent.setId(snowflake.nextId()); machineIotDataReceivedEvent.setMachineIotMac(Long.valueOf(event.get__assetId__())); machineIotDataReceivedEvent.setDataSource(DataSource.ROOT_CLOUD); @@ -214,13 +215,13 @@ public class RootCloudIotDataFormatterJob { machineIotDataReceivedEvent.setIgStat(event.getIG_sta()); machineIotDataReceivedEvent.setAccJobCount(event.getACC_count_total()); // 当天的工作产能 - machineIotDataReceivedEvent.setJobCountOfTheDay(event.getACC_count()); + machineIotDataReceivedEvent.setJobCountOfTheDay(0L); // 当天的工作时长 machineIotDataReceivedEvent .setJobDurationOfTheDay(event.getRunning_duration() == null ? 0L : event.getRunning_duration().longValue()); String stopDuration = event.getStoping_duration(); if (stopDuration != null) { - machineIotDataReceivedEvent.setCurrStoppingDuration(Long.parseLong(stopDuration)); + machineIotDataReceivedEvent.setCurrStoppingDuration(Long.parseLong(stopDuration.split("\\.")[0])); } machineIotDataReceivedEvent .setCurrWaitingDuration(event.getWaiting_duration() == null ? 0L : event.getWaiting_duration().longValue());