From 0ce061d9ed37a6c25fff70e4734fa8cc8747237c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 26 Jul 2023 19:45:09 +0800
Subject: [PATCH] fix: 部分提交
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 163 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index 07b3958..bc817e4 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -1,15 +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.HistoryDaily;
+import com.moral.api.entity.Sensor;
import com.moral.api.mapper.HistoryDailyMapper;
import com.moral.api.service.HistoryDailyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.service.SensorService;
+import com.moral.constant.Constants;
+import com.moral.util.AmendUtils;
+import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import javax.xml.crypto.Data;
+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.stream.Collectors;
+import java.util.stream.DoubleStream;
/**
* <p>
@@ -25,9 +43,151 @@
@Autowired
private HistoryDailyMapper historyDailyMapper;
+ @Autowired
+ private SensorService sensorService;
+
+ @Autowired
+ private HistoryHourlyService historyHourlyService;
+
@Override
- public void insertHistoryDaily(List<HistoryDaily> list) {
- System.out.println(list);
- historyDailyMapper.insertHistoryDaily(list);
+ @Transactional
+ public void insertHistoryDaily(String time) {
+ String format = DateUtils.yyyy_MM_dd_EN;
+ Date now;
+ if(StringUtils.isEmpty(time)){
+ now = new Date();
+ } else {
+ now = DateUtils.getDate(time,"yyyy-MM-dd");
+ }
+ //���������������������
+ Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), format);
+ //���������������������
+ Date end = DateUtils.dataToTimeStampTime(now, format);
+ //������
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.select("code", "lower", "upper").eq("is_delete", Constants.NOT_DELETE);
+ List<Sensor> sensors = sensorService.list(sensorQueryWrapper);
+ //������������������������������
+ Map<String, Object> prop = new HashMap<>();
+ String timeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
+ prop.put("timeUnits", timeUnits);
+ prop.put("start", DateUtils.dateToDateString(start));
+ prop.put("end", DateUtils.dateToDateString(end));
+ List<Map<String, Object>> dailyData = historyHourlyService.selectDailyData(prop);
+
+ if (dailyData.size() == 0) {
+ System.out.println("������������������"+DateUtils.dateToDateString(start));
+ return;
+ }
+
+ //���mac������
+ Map<String, List<Map<String, Object>>> data = dailyData.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("mac")));
+
+ //���������������������������
+ List<Map<String, Object>> insertData = new ArrayList<>();
+
+ data.forEach((mac, value) -> {
+ Map<String, Object> dataMap = new HashMap<>();
+ Map<String, Object> jsonMap = new HashMap<>();
+ dataMap.put("mac", mac);
+ dataMap.put("time", start);
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("data", value);
+ params.put("type", "day");
+ for (Sensor sensor : sensors) {
+ String sensorCode = sensor.getCode();
+
+ //O3���������
+ if (sensorCode.equals(Constants.SENSOR_CODE_O3)) {
+ if (sensor.getUpper() != null) {
+ params.put("o3Upper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ params.put("o3Lower", sensor.getLower());
+ }
+ }
+
+ //���������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_WIND_DIR)) {
+ if (sensor.getUpper() != null) {
+ params.put("windDirUpper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ params.put("windDirLower", sensor.getLower());
+ }
+ }
+
+ //���������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_WIND_SPEED)) {
+ if (sensor.getUpper() != null) {
+ params.put("windSpeedUpper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ params.put("windSpeedLower", sensor.getLower());
+ }
+ }
+ }
+ //������8������������������������������������
+ Map<String, Object> o3AvgOfDay = AmendUtils.getO3AvgOfDay(params);
+ if (!ObjectUtils.isEmpty(o3AvgOfDay)) {
+ jsonMap.putAll(o3AvgOfDay);
+ }
+
+ //���������������������������
+ Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(params);
+ if (!ObjectUtils.isEmpty(windDirAvg)) {
+ jsonMap.putAll(windDirAvg);
+ }
+
+ sensors.forEach(sensor -> {
+ String sensorCode = sensor.getCode();
+ Double upper = sensor.getUpper();
+ Double lower = sensor.getLower();
+ OptionalDouble 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;
+ }
+
+ //O3������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_O3)) {
+ 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);
+ }).average();
+ if (optionalDouble.isPresent()) {
+ //���������������������
+ double sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 4);
+ jsonMap.put(sensorCode, sciCal);
+ }
+ });
+ dataMap.put("value", JSONObject.toJSONString(jsonMap));
+ insertData.add(dataMap);
+ });
+ //���������������
+ historyDailyMapper.insertHistoryDaily(insertData);
+ System.out.println("������������");
}
}
--
Gitblit v1.8.0