From 5158c660013d52524559d4435f27b5e63d3221b7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 17 Nov 2021 13:54:25 +0800
Subject: [PATCH] screen-api 更改饼状图接口
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 f1a0a96..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<>();
@@ -135,7 +135,7 @@
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
Object sensorValue = dataValue.get(sensorCode);
//������������������������
- Object flag = dataValue.get(sensorCode + Constants.MARKER_BIT_KEY);
+ Object flag = dataValue.get(sensorCode + "-" + Constants.MARKER_BIT_KEY);
if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
return null;
}
@@ -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