From 267c20d552dbce24bce0a0d59a106f49f879ab62 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Nov 2021 15:33:27 +0800
Subject: [PATCH] city_aqi，city_aqi_daily 6参转大写
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index ae9d97a..27d808e 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -88,7 +88,7 @@
data.forEach((key, value) -> {
Map<String, Object> dataMap = new HashMap<>();
dataMap.put("mac", key);
- dataMap.put("time", end);
+ dataMap.put("time", start);
Map<String, Object> jsonMap = new HashMap<>();
@@ -150,12 +150,12 @@
//������������������������������������
double aDouble = Double.parseDouble(sensorValue.toString());
if (!ObjectUtils.isEmpty(upper)) {
- if (aDouble < upper) {
+ if (aDouble > upper) {
return null;
}
}
if (!ObjectUtils.isEmpty(lower)) {
- if (aDouble > lower) {
+ if (aDouble < lower) {
return null;
}
}
--
Gitblit v1.8.0