From c35090abedcfd1c9a8d53794570e836f2b0bb866 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Feb 2022 15:25:43 +0800
Subject: [PATCH] 督办单编号唯一性
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 154 insertions(+), 0 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 62b2796..b6f156f 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
@@ -30,8 +30,10 @@
import java.util.OptionalDouble;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
+import java.util.stream.Stream;
/**
* <p>
@@ -251,6 +253,106 @@
return datas;
}
+ @Override
+ public void insertHistoryHourlyComplete() {
+ //������������������yyyy-MM-dd HH:mm
+ String format = DateUtils.yyyy_MM_dd_HH_EN;
+ Date now = new Date();
+
+ //������������������������������
+ Map<String, Object> params = new HashMap<>();
+ //������������
+ Date start = DateUtils.dataToTimeStampTime(DateUtils.addHours(now, -1), format);
+ //������������
+ Date end = DateUtils.dataToTimeStampTime(now, format);
+ params.put("start", start);
+ params.put("end", end);
+ //������������������������������
+ String timeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
+ params.put("timeUnits", timeUnits);
+
+ //������
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.select("code", "lower", "upper").eq("is_delete", Constants.NOT_DELETE);
+ List<Sensor> sensors = sensorService.list(sensorQueryWrapper);
+
+ //������������������������������������������
+ List<Map<String, Object>> hourlyData = historyMinutelyMapper.getHourlyData(params);
+ if (ObjectUtils.isEmpty(hourlyData)) {
+ return;
+ }
+
+ //���mac������
+ Map<String, List<Map<String, Object>>> data = hourlyData.parallelStream()
+ .collect(Collectors.groupingBy(o -> (String) o.get("mac")));
+
+ //���������������������������
+ List<Map<String, Object>> insertData = new ArrayList<>();
+
+ data.forEach((key, value) -> {
+ Map<String, Object> dataMap = new HashMap<>();
+ dataMap.put("mac", key);
+ dataMap.put("time", start);
+ Map<String, Object> jsonMap = new HashMap<>();
+
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", value);
+ map.put("type", "hourlyComplete");
+ 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());
+ }
+ }
+ }
+ Supplier<Stream<Map<String, Object>>> streamSupplier = () -> value.stream();
+ //������������������������������������
+ sensors.forEach(sensor -> {
+ Double avg = calculatedValue(streamSupplier, sensor, "avg");
+ if (Constants.SENSOR_CODE_WIND_DIR.equals(sensor.getCode())) {
+ //���������������������������
+ Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(map);
+ if (!ObjectUtils.isEmpty(windDirAvg)) {
+ avg = (Double) windDirAvg.get(Constants.SENSOR_CODE_WIND_DIR);
+ }
+ }
+ Double min = calculatedValue(streamSupplier, sensor, "min");
+ Double max = calculatedValue(streamSupplier, sensor, "max");
+ List<Double> doubles = new ArrayList<>(3);
+ if (avg != null && min != null && max != null) {
+ doubles.add(avg);
+ doubles.add(min);
+ doubles.add(max);
+ jsonMap.put(sensor.getCode(), doubles);
+ }
+ });
+ dataMap.put("value", JSONObject.toJSONString(jsonMap));
+ insertData.add(dataMap);
+ });
+
+ //������
+ String insertTimeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
+ //���������������
+ historyHourlyMapper.insertHistoryHourlyComplete(insertData, insertTimeUnits);
+ }
+
/**
* @Description: ������������������������������������������������wrapper���������������
* @Param: [wrapper, tableNames]
@@ -268,4 +370,56 @@
MybatisPlusConfig.tableName.remove();
return result;
}
+
+ //���������������������������������������
+ private Double calculatedValue(Supplier<Stream<Map<String, Object>>> supplier, Sensor sensor, String type) {
+ String sensorCode = sensor.getCode();
+ Double upper = sensor.getUpper();
+ Double lower = sensor.getLower();
+ DoubleStream doubleStream = supplier.get()
+ .flatMapToDouble(v -> {
+ 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);
+ if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
+ return null;
+ }
+
+ if (ObjectUtils.isEmpty(sensorValue)) {
+ return null;
+ }
+ //������������������
+ if ("avg".equals(type) && Constants.SENSOR_CODE_WIND_DIR.equals(sensorCode)) {
+ return null;
+ }
+ //������������������������������������
+ double aDouble = Double.parseDouble(sensorValue.toString());
+ if (!ObjectUtils.isEmpty(upper)) {
+ if (aDouble > upper) {
+ return null;
+ }
+ }
+ if (!ObjectUtils.isEmpty(lower)) {
+ if (aDouble < lower) {
+ return null;
+ }
+ }
+ return DoubleStream.of(aDouble);
+ });
+ OptionalDouble average = null;
+ if ("avg".equals(type)) {
+ average = doubleStream.average();
+ } else if ("min".equals(type)) {
+ average = doubleStream.min();
+ } else if ("max".equals(type)) {
+ average = doubleStream.max();
+ }
+
+ if (average.isPresent()) {
+ //���������������������
+ return AmendUtils.sciCal(average.getAsDouble(), 4);
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0