From f98e4b55b8aaa7a9d5bb6508d679951c8bdc197e Mon Sep 17 00:00:00 2001 From: "hupenghui@qniao.cn" <1049970895> Date: Wed, 24 Aug 2022 23:39:13 +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 --- .../java/com/qniao/iot/IotMonitoringDataJob.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qniao/iot/IotMonitoringDataJob.java b/src/main/java/com/qniao/iot/IotMonitoringDataJob.java index b92ab9e..9565b83 100644 --- a/src/main/java/com/qniao/iot/IotMonitoringDataJob.java +++ b/src/main/java/com/qniao/iot/IotMonitoringDataJob.java @@ -208,9 +208,11 @@ public class IotMonitoringDataJob { nowDeviceState.setTheDayDuration(lastedDeviceState.getTheDayDuration() + workingDuration); nowDeviceState.setTheDayJobDuration(lastedDeviceState.getTheDayJobDuration() + workingDuration); nowDeviceState.setJobDurationTotal(lastedDeviceState.getJobDurationTotal() + workingDuration); - // 确认下当天数量CurrJobCount是否会清零 - nowDeviceState.setTheDayJobCount(receivedEvent.getCurrJobCount()); - nowDeviceState.setJobTotal(receivedEvent.getAccJobCount()); + Long lastJobTotal = lastedDeviceState.getJobTotal(); + Long accJobCount = receivedEvent.getAccJobCount(); + // 直接往上类 + nowDeviceState.setTheDayJobCount(lastedDeviceState.getTheDayJobCount() + (accJobCount - lastJobTotal)); + nowDeviceState.setJobTotal(accJobCount); } else { // 机智云 nowDeviceState.setTheDayDuration(lastedDeviceState.getTheDayDuration() + receivedEvent.getCurrJobDuration()); @@ -236,7 +238,10 @@ public class IotMonitoringDataJob { // 工作 if (dataSource == 1) { // 树根（今日当前数 + 这次信息点距离上次信息点生产的数量） - nowDeviceState.setTheDayJobCount(receivedEvent.getCurrJobCount()); + Long lastJobTotal = lastedDeviceState.getJobTotal(); + Long accJobCount = receivedEvent.getAccJobCount(); + // 直接往上类 + nowDeviceState.setTheDayJobCount(lastedDeviceState.getTheDayJobCount() + (accJobCount - lastJobTotal)); nowDeviceState.setJobTotal(receivedEvent.getAccJobCount()); nowDeviceState.setTheDayJobDuration(lastedDeviceState.getTheDayJobDuration() + workingDuration); nowDeviceState.setJobDurationTotal(lastedDeviceState.getJobDurationTotal() + workingDuration);