From faf8649ff22b8af12c758355725389204838e02a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 05 Aug 2021 13:23:54 +0800
Subject: [PATCH] 小时缺失数据补充定时任务
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 133 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 125 insertions(+), 8 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 d22e534..dd63413 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
@@ -1,14 +1,33 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistoryHourly;
+import com.moral.api.entity.Sensor;
import com.moral.api.mapper.HistoryHourlyMapper;
+import com.moral.api.mapper.HistoryMinutelyMapper;
import com.moral.api.service.HistoryHourlyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SensorService;
+import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
+import com.moral.util.AmendUtils;
+import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+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.Set;
+import java.util.stream.Collectors;
+import java.util.stream.DoubleStream;
/**
* <p>
@@ -24,15 +43,113 @@
@Autowired
private HistoryHourlyMapper historyHourlyMapper;
- @Override
- public void insertHistoryHourly() {
- //���������������������������
- List<HistoryHourly> list = historyHourlyMapper.getHistoryHourlyTransition();
- historyHourlyMapper.insertHistoryHourly(list);
- }
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ @Autowired
+ private HistoryMinutelyMapper historyMinutelyMapper;
+
+ @Autowired
+ private SensorService sensorService;
@Override
- public void deleteHistoryHourlyTransition() {
- historyHourlyMapper.deleteHistoryHourlyTransition();
+ public void insertHistoryHourly() {
+ //������������������yyyy-MM-dd HH:mm
+ String format = DateUtils.yyyy_MM_dd_HH_EN;
+
+ //redis������������������mac
+ Set<String> macs = redisTemplate.opsForHash().keys(RedisConstants.DEVICE);
+ //������������������������
+ Date now = new Date();
+ String time = DateUtils.dateToDateString(now, format) + ":00:00";
+
+ QueryWrapper<HistoryHourly> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("time", time);
+ //������������������������������������������������macs������������������������������
+ Integer count = historyHourlyMapper.selectCount(queryWrapper);
+ if (macs.size() > count) {
+ macs.removeIf(mac -> {
+ queryWrapper.clear();
+ queryWrapper.eq("time", time);
+ queryWrapper.eq("mac", mac);
+ Integer num = historyHourlyMapper.selectCount(queryWrapper);
+ return num != 0;
+ });
+ }
+
+ Map<String, Object> params = new HashMap<>();
+
+ //������������
+ String dateString = DateUtils.getDateStringOfHour(-1, format);
+ Date start = DateUtils.getDate(dateString, format);
+
+ //������������
+ Date end = DateUtils.dataToTimeStampTime(now, format);
+
+ //������������������������������������������
+ String timeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
+
+ //������
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);
+ List<Object> sensorCodes = sensorService.listObjs(sensorQueryWrapper);
+
+ params.put("timeUnits", timeUnits);
+ params.put("start", start);
+ params.put("end", end);
+ params.put("macs", macs);
+ //���������������������1������������������
+ List<Map<String, Object>> hourlyData = historyMinutelyMapper.getHistoryMinutelyData(params);
+ if (hourlyData.size() == 0) {
+ return;
+ }
+
+ //���mac������
+ Map<String, List<Map<String, Object>>> data = hourlyData.parallelStream()
+ .collect(Collectors.groupingBy(o -> (String) o.get("mac")));
+
+ //���������������������������
+ List<HistoryHourly> insertData = new ArrayList<>();
+
+ data.forEach((key, value) -> {
+ HistoryHourly historyHourly = new HistoryHourly();
+ historyHourly.setMac(key);
+ historyHourly.setTime(end);
+ Map<String, Object> jsonMap = new HashMap<>();
+
+ //���������������������������
+ Object windDirAvg = AmendUtils.getWindDirAvg(value);
+ if (windDirAvg != null) {
+ jsonMap.put(Constants.SENSOR_CODE_WIND_DIR, windDirAvg);
+ }
+
+ //������������������������������������
+ sensorCodes.forEach(sensorCode -> {
+ OptionalDouble optionalDouble = value.parallelStream()
+ .flatMapToDouble(v -> {
+ Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
+ Object sensorValue = dataValue.get(sensorCode.toString());
+ 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 sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 4);
+ jsonMap.put(sensorCode.toString(), sciCal);
+ }
+ });
+ historyHourly.setValue(JSONObject.toJSONString(jsonMap));
+ historyHourly.setVersion((Integer) value.get(0).get("version"));
+ insertData.add(historyHourly);
+ });
+
+ //���������������
+ historyHourlyMapper.insertHistoryHourly(insertData);
}
}
--
Gitblit v1.8.0