From 547b51661fefe8d7b88640b29a60db8874f5efac Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 14 Mar 2022 16:27:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-job/src/main/java/com/moral/api/task/InformationTask.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/task/InformationTask.java b/screen-job/src/main/java/com/moral/api/task/InformationTask.java
index d4d931a..cab0ba1 100644
--- a/screen-job/src/main/java/com/moral/api/task/InformationTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/InformationTask.java
@@ -159,7 +159,7 @@
TVOCListNow.add(Double.parseDouble(jsonObject.get("a99054").toString()));
}
List<HistoryHourly> historyHourliesBefore = new ArrayList<>();
- historyHourliesBefore = historyHourlyService.getValueByMacAndTime("p5dnd7a0392252", df1.parse(beforeTime), df1.parse(df.format(beforeCalendar.getTime()) + ":00:01"));
+ historyHourliesBefore = historyHourlyService.getValueByMacAndTime(mac, df1.parse(beforeTime), df1.parse(df.format(beforeCalendar.getTime()) + ":00:01"));
if (!ObjectUtils.isEmpty(historyHourliesBefore) && historyHourliesBefore.size()>0){
String value = historyHourliesBefore.get(0).getValue();
JSONObject jsonObject = JSONObject.parseObject(value);
--
Gitblit v1.8.0