From 1e26fc1ca98b19eaa9813a6ea03a0c65b1ccef39 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 11:58:35 +0800
Subject: [PATCH] update
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 93 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 77 insertions(+), 16 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index dd63413..797334b 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -26,6 +26,7 @@
import java.util.Map;
import java.util.OptionalDouble;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
@@ -77,8 +78,6 @@
});
}
- Map<String, Object> params = new HashMap<>();
-
//������������
String dateString = DateUtils.getDateStringOfHour(-1, format);
Date start = DateUtils.getDate(dateString, format);
@@ -91,9 +90,11 @@
//������
QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
- sensorQueryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);
- List<Object> sensorCodes = sensorService.listObjs(sensorQueryWrapper);
+ sensorQueryWrapper.select("code", "lower", "upper").eq("is_delete", Constants.NOT_DELETE);
+ List<Sensor> sensors = sensorService.list(sensorQueryWrapper);
+ //������������������������������������������
+ Map<String, Object> params = new HashMap<>();
params.put("timeUnits", timeUnits);
params.put("start", start);
params.put("end", end);
@@ -117,31 +118,91 @@
historyHourly.setTime(end);
Map<String, Object> jsonMap = new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", value);
+ map.put("type", "hour");
+
+ for (Sensor sensor : sensors) {
+ String sensorCode = sensor.getCode();
+
+ //���������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_WIND_DIR)) {
+ if (sensor.getUpper() != null) {
+ map.put("windDirUpper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ map.put("windDirLower", sensor.getLower());
+ }
+ }
+
+ //���������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_WIND_SPEED)) {
+ if (sensor.getUpper() != null) {
+ map.put("windSpeedUpper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ map.put("windSpeedLower", sensor.getLower());
+ }
+ }
+ }
+
//���������������������������
- Object windDirAvg = AmendUtils.getWindDirAvg(value);
- if (windDirAvg != null) {
- jsonMap.put(Constants.SENSOR_CODE_WIND_DIR, windDirAvg);
+ Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(map);
+ if (!ObjectUtils.isEmpty(windDirAvg)) {
+ jsonMap.putAll(windDirAvg);
}
//������������������������������������
- sensorCodes.forEach(sensorCode -> {
- OptionalDouble optionalDouble = value.parallelStream()
+ sensors.forEach(sensor -> {
+ String sensorCode = sensor.getCode();
+ Double upper = sensor.getUpper();
+ Double lower = sensor.getLower();
+ AtomicInteger size = new AtomicInteger();
+ DoubleStream optionalDouble = value.parallelStream()
.flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
- Object sensorValue = dataValue.get(sensorCode.toString());
+ Object sensorValue = dataValue.get(sensorCode);
+ //������������������������
+ Object flag = dataValue.get(sensorCode + Constants.MARKER_BIT_KEY);
+ if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
+ return null;
+ }
+
if (ObjectUtils.isEmpty(sensorValue)) {
return null;
}
- //������������������
+
+ //������������������
if (Constants.SENSOR_CODE_WIND_DIR.equals(sensorCode)) {
return null;
}
- return DoubleStream.of(Double.parseDouble(sensorValue.toString()));
- }).average();
- if (optionalDouble.isPresent()) {
+
+ //������������������������������������
+ double aDouble = Double.parseDouble(sensorValue.toString());
+ if (!ObjectUtils.isEmpty(upper)) {
+ if (aDouble < upper) {
+ return null;
+ }
+ }
+ if (!ObjectUtils.isEmpty(lower)) {
+ if (aDouble > lower) {
+ return null;
+ }
+ }
+ size.getAndIncrement();
+ return DoubleStream.of(aDouble);
+ });
+ OptionalDouble average = optionalDouble.average();
+ if (average.isPresent()) {
//���������������������
- double sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 4);
- jsonMap.put(sensorCode.toString(), sciCal);
+ double sciCal = AmendUtils.sciCal(average.getAsDouble(), 4);
+ jsonMap.put(sensorCode, sciCal);
+ //���������
+ if (size.get() >= 45) {
+ jsonMap.put(sensorCode + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_TRUE);
+ } else {
+ jsonMap.put(sensorCode + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_FALSE);
+ }
}
});
historyHourly.setValue(JSONObject.toJSONString(jsonMap));
--
Gitblit v1.8.0