From c7d5088dbd18cbbcb98d12aeac35e7d38cdf93be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Sun, 26 Sep 2021 17:31:23 +0800
Subject: [PATCH] 臭氧8小时滑动值算法，分钟，小时数据时间变更为开始时间
---
screen-common/src/main/java/com/moral/util/AmendUtils.java | 84 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 19 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 5a0f173..a22b4a1 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -60,7 +60,7 @@
Double o3 = Double.parseDouble(dataValue.get(Constants.SENSOR_CODE_O3).toString());
//O3���������������
- Object flag = dataValue.get(Constants.SENSOR_CODE_O3 + Constants.MARKER_BIT_KEY);
+ Object flag = dataValue.get(Constants.SENSOR_CODE_O3 + "-" + Constants.MARKER_BIT_KEY);
//������������������������������
if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
continue;
@@ -103,6 +103,52 @@
}
/**
+ * @param data ������ time:Date������
+ * @return ���������������8���������������������
+ */
+ public static List<Map<String, Object>> getO3_8H(List<Map<String, Object>> data) {
+ Date time1 = null;
+ Date time2 = null;
+ for (Map<String, Object> datum : data) {
+ Date time = (Date) datum.get("time");
+ if (DateUtils.getHour(time) == 0) {
+ time2 = DateUtils.getDate(DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_EN));
+ } else {
+ time1 = DateUtils.getDate(DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_EN));
+ }
+ }
+
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (int i = 8; i <= 24; i++) {
+ Map<String, Object> map = new HashMap<>();
+ if (i < 24) {
+ map.put("time", ObjectUtils.isEmpty(time1) ? null : DateUtils.addHours(time1, i));
+ } else {
+ map.put("time", ObjectUtils.isEmpty(time2) ? null : time2);
+ }
+ List<Double> value = new ArrayList<>();
+ for (Map<String, Object> dataMap : data) {
+ Double o3 = Double.parseDouble(dataMap.get(Constants.SENSOR_CODE_O3).toString());
+ Date time = (Date) dataMap.get("time");
+ int hour = DateUtils.getHour(time);
+ if (hour == 0) {
+ hour = 24;
+ }
+ if (hour <= i && hour >= i - 7) {
+ value.add(o3);
+ }
+ }
+ if (value.size() < 6) {
+ continue;
+ }
+ double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
+ map.put(Constants.SENSOR_CODE_O3, average);
+ result.add(map);
+ }
+ return result;
+ }
+
+ /**
* @param params ������
* @return ���������������������������
*/
@@ -115,16 +161,16 @@
Object windSpeedUpper = params.get("windSpeedUpper");
Object windSpeedLower = params.get("windSpeedLower");
- double avgDir;
- double sumSin = 0d;
- double sumCos = 0d;
- int size = 0;
+ Double avgDir = null;
+ Double sumSin = 0d;
+ Double sumCos = 0d;
+ Integer size = 0;
for (Map<String, Object> map : data) {
Map<String, Object> dataValue = JSONObject.parseObject((String) map.get("value"), Map.class);
Object wind = dataValue.get(Constants.SENSOR_CODE_WIND_DIR);
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);
+ 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;
}
@@ -179,17 +225,17 @@
avgDir = Math.atan(avgSin / avgCos) * 180 / Math.PI + 180;
} else if (avgSin < 0 && avgCos > 0) {
avgDir = Math.atan(avgSin / avgCos) * 180 / Math.PI + 360;
- } else {
- avgDir = 0;
}
- double v = sciCal(avgDir, 4);
- result.put(Constants.SENSOR_CODE_WIND_DIR, v);
- if ("hour".equals(type)) {
- //���������>=45���,������������ N,<45���H H:���������������
- if (size >= 45) {
- result.put(Constants.SENSOR_CODE_WIND_DIR + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_TRUE);
- } else {
- result.put(Constants.SENSOR_CODE_WIND_DIR + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_FALSE);
+ if (!ObjectUtils.isEmpty(avgDir)) {
+ double v = sciCal(avgDir, 4);
+ result.put(Constants.SENSOR_CODE_WIND_DIR, v);
+ if ("hour".equals(type)) {
+ //���������>=45���,������������ N,<45���H H:���������������
+ if (size >= 45) {
+ result.put(Constants.SENSOR_CODE_WIND_DIR + "-" + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_TRUE);
+ } else {
+ result.put(Constants.SENSOR_CODE_WIND_DIR + "-" + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_FALSE);
+ }
}
}
return result;
@@ -224,7 +270,7 @@
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);
+ Object flag = dataValue.get(Constants.SENSOR_CODE_CO + "-" + Constants.MARKER_BIT_KEY);
if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
continue;
}
@@ -262,7 +308,7 @@
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);
+ Object flag = dataValue.get(Constants.SENSOR_CODE_O3 + "-" + Constants.MARKER_BIT_KEY);
if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
continue;
}
--
Gitblit v1.8.0