From d7b233b6ed1793255adee6ed1e0cbe950e6c7e9f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Sep 2021 13:30:28 +0800
Subject: [PATCH] 5分钟数据统计bug
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 4 ++--
screen-common/src/main/java/com/moral/util/AmendUtils.java | 15 +++++----------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 4ed255f..ff1ede5 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -172,8 +172,11 @@
Object speed = dataValue.get(Constants.SENSOR_CODE_WIND_SPEED);
Object flagDir = dataValue.get(Constants.SENSOR_CODE_WIND_DIR + "-" + Constants.MARKER_BIT_KEY);
Object flagSpeed = dataValue.get(Constants.SENSOR_CODE_WIND_SPEED + "-" + Constants.MARKER_BIT_KEY);
- if (!Constants.MARKER_BIT_TRUE.equals(flagDir) || !Constants.MARKER_BIT_TRUE.equals(flagSpeed)) {
- continue;
+
+ if (!ObjectUtils.isEmpty(flagDir) && !ObjectUtils.isEmpty(flagSpeed)) {
+ if (!Constants.MARKER_BIT_TRUE.equals(flagDir) || !Constants.MARKER_BIT_TRUE.equals(flagSpeed)) {
+ continue;
+ }
}
if (ObjectUtils.isEmpty(wind) || ObjectUtils.isEmpty(speed)) {
@@ -271,10 +274,6 @@
for (Map<String, Object> dataMap : list) {
Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
Object o = dataValue.get(Constants.SENSOR_CODE_CO);
- Object flag = dataValue.get(Constants.SENSOR_CODE_CO + "-" + Constants.MARKER_BIT_KEY);
- if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
- continue;
- }
if (ObjectUtils.isEmpty(o)) {
continue;
}
@@ -309,10 +308,6 @@
for (Map<String, Object> dataMap : list) {
Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
Object o = dataValue.get(Constants.SENSOR_CODE_O3);
- Object flag = dataValue.get(Constants.SENSOR_CODE_O3 + "-" + Constants.MARKER_BIT_KEY);
- if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
- continue;
- }
if (ObjectUtils.isEmpty(o)) {
continue;
}
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 fe84de2..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
@@ -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