From 01b5c9adfcc7b94469812edba7c2b1182a3a4c25 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 03 Nov 2021 15:27:10 +0800
Subject: [PATCH] screen-api 修改获取AQI大小写
---
screen-common/src/main/java/com/moral/util/AmendUtils.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 ff1ede5..4218796 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -93,7 +93,6 @@
avgs.add(average);
}
max = avgs.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getMax();
- System.out.println(avgs.size());
if (avgs.size() < 14) {
if (max < 160d) {
return result;
@@ -103,8 +102,24 @@
return result;
}
+ //������aqi���������
+ public static Double o3OfDay(List<Map<String, Object>> value) {
+ List<Map<String, Object>> o3_8H = getO3_8H(value);
+ if (!ObjectUtils.isEmpty(o3_8H)) {
+ double o3 = 0d;
+ for (Map<String, Object> o : o3_8H) {
+ double temp = (double) o.get("o3");
+ if (temp > o3) {
+ o3 = temp;
+ }
+ }
+ return sciCal(o3, 0);
+ }
+ return null;
+ }
+
/**
- * @param data ������ time:Date������
+ * @param data ������ time:Date������,������key:o3
* @return ���������������8���������������������
*/
public static List<Map<String, Object>> getO3_8H(List<Map<String, Object>> data) {
@@ -129,7 +144,8 @@
}
List<Double> value = new ArrayList<>();
for (Map<String, Object> dataMap : data) {
- Double o3 = Double.parseDouble(dataMap.get(Constants.SENSOR_CODE_O3).toString());
+ Map<String, Object> sensorValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
+ Double o3 = Double.parseDouble(sensorValue.get("o3").toString());
Date time = (Date) dataMap.get("time");
int hour = DateUtils.getHour(time);
if (hour == 0) {
@@ -143,7 +159,7 @@
continue;
}
double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
- map.put(Constants.SENSOR_CODE_O3, average);
+ map.put("o3", average);
result.add(map);
}
return result;
--
Gitblit v1.8.0