From 18b77c8cb85cb6151ec5b511cc68e79f4d318466 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Tue, 11 Jul 2023 22:52:51 +0800
Subject: [PATCH] chore:测试提交
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 145 ++++++++++++++++++++++++++++++++++++++++++++++--
screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java | 3 +
screen-job/src/main/java/com/moral/api/controller/PubController.java | 6 ++
3 files changed, 148 insertions(+), 6 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index 7343dd5..093b752 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -49,6 +49,12 @@
return new ResultMessage();
}
+ @GetMapping("FiveMinutelyTest")
+ @ApiOperation(value = "5������������1", notes = "5������������1")
+ public ResultMessage FiveMinutelyTest(String yz,String mac) {
+ historyFiveMinutelyService.insertHistoryFiveMinutely(yz,mac);
+ return new ResultMessage();
+ }
public static void main(String[] args) {
diff --git a/screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java b/screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
index f2f0cc3..953ccd4 100644
--- a/screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
+++ b/screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
@@ -8,4 +8,7 @@
//5������������insert
void insertHistoryFiveMinutely();
+
+ void insertHistoryFiveMinutely(String yz,String mac);
+
}
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 f2b0a38..03e64dc 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
@@ -6,12 +6,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.OptionalDouble;
+import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
@@ -26,6 +21,7 @@
import com.moral.constant.RedisConstants;
import com.moral.util.AmendUtils;
import com.moral.util.DateUtils;
+import org.springframework.util.StringUtils;
@Service
public class HistoryFiveMinutelyServiceImpl implements HistoryFiveMinutelyService {
@@ -182,4 +178,141 @@
//���������������
historyFiveMinutelyMapper.insertHistoryFiveMinutely(insertData, insertTimeUnits);
}
+
+ @Override
+ public void insertHistoryFiveMinutely(String yz, String mac) {
+ String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
+ Date now = new Date();
+ now = DateUtils.getFiveMinuteDate(now);
+
+ //������������������������������
+ Map<String, Object> params = new HashMap<>();
+ //������������
+ Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfMin(now, -5), 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);
+ if(!StringUtils.isEmpty(mac)){
+ params.put("macs", Arrays.asList(mac));
+ }
+ //������
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.select("code", "lower", "upper").eq("is_delete", Constants.NOT_DELETE);
+ if(!StringUtils.isEmpty(yz)){
+ sensorQueryWrapper.eq("code",yz);
+ }
+ List<Sensor> sensors = sensorService.list(sensorQueryWrapper);
+
+ //���������������������5������������������
+ List<Map<String, Object>> fiveMinutelyData = historyMinutelyMapper.getHistoryMinutelyData(params);
+ if (fiveMinutelyData.size() == 0) {
+ return;
+ }
+
+ //���mac������
+ Map<String, List<Map<String, Object>>> data = fiveMinutelyData.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", "fiveMinutes");
+ 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());
+ }
+ }
+ }
+
+ //���������������������������
+ Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(map);
+ if (!ObjectUtils.isEmpty(windDirAvg)) {
+ jsonMap.putAll(windDirAvg);
+ }
+
+ //������������������������������������
+ sensors.forEach(sensor -> {
+ String sensorCode = sensor.getCode();
+ Double upper = sensor.getUpper();
+ Double lower = sensor.getLower();
+ DoubleStream optionalDouble = value.parallelStream()
+ .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 (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 = optionalDouble.average();
+ if (average.isPresent()) {
+ //���������������������
+ double sciCal = AmendUtils.sciCal(average.getAsDouble(), 4);
+ jsonMap.put(sensorCode, sciCal);
+ }
+
+ });
+ dataMap.put("value", JSONObject.toJSONString(jsonMap));
+ //������redis
+ jsonMap.put("dataTime", DateUtils.dateToDateString(start));
+ // redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
+ //insertData.add(dataMap);
+ System.out.println(dataMap);
+ });
+
+
+ }
}
--
Gitblit v1.8.0