From f99ac7dc0f77123e95128d78ee95c134aedbd0d8 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 11 Sep 2020 09:50:25 +0800
Subject: [PATCH] 小时数据警报无条件测试
---
src/main/java/com/moral/task/HistoryTableInsertTask.java | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 151 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index ca7e19c..8af56a4 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -4,6 +4,7 @@
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -11,24 +12,27 @@
import javax.annotation.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.moral.entity.Organization;
import com.moral.service.DeviceService;
import com.moral.service.HistoryDailyService;
import com.moral.service.HistoryHourlyService;
import com.moral.service.HistoryMinutelyService;
import com.moral.service.HistoryService;
+import com.moral.service.OrganizationService;
import com.moral.service.SensorService;
+import com.moral.util.WeatherUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.core.log.XxlJobLogger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
@Component
public class HistoryTableInsertTask {
@@ -52,11 +56,31 @@
@Resource
private HistoryDailyService historyDailyService;
+ @Resource
+ private OrganizationService organizationService;
+
+ @Resource
+ private WeatherUtil weatherUtil;
+
+
@XxlJob("historyMinutely")
public ReturnT insertHistoryMinutelyTable(String params) {
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ int hour = time.getHour();
+ int minute = time.getMinute();
+ if (day == 1) {
+ if (hour == 0 && minute == 0) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
LocalDateTime endTime = time.truncatedTo(ChronoUnit.MINUTES);
@@ -112,9 +136,8 @@
int month = time.getMonthValue();
int day = time.getDayOfMonth();
int hour = time.getHour();
- int minute = time.getMinute();
if (day == 1) {
- if (hour == 0 && minute == 0) {
+ if (hour == 0) {
if (month == 1) {
month = 12;
year = year - 1;
@@ -242,6 +265,19 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ int hour = time.getHour();
+ int minute = time.getMinute();
+ if (day == 1) {
+ if (hour == 0 && minute <= 30) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
LocalDateTime value = time.truncatedTo(ChronoUnit.MINUTES);
@@ -316,4 +352,111 @@
return returnT;
}
+ @XxlJob("historyO3")
+ public ReturnT insertHistoryO3Table(String params) {
+ Map macMap = JSON.parseObject(params);
+ List<String> macList = (List<String>) macMap.get("mac");
+ String illuminationRatio = macMap.get("illuminationRatio").toString();
+ String pressureRatio1 = macMap.get("pressureRatio1").toString();
+ String pressureRatio2 = macMap.get("pressureRatio2").toString();
+ String windSpeedRatio = macMap.get("windSpeedRatio").toString();
+ BigDecimal temperatureRatio;
+ BigDecimal humidityRatio;
+ LocalDateTime time = LocalDateTime.now();
+ LocalDateTime value = time.truncatedTo(ChronoUnit.HOURS);
+ LocalDateTime illuminationTime = value.minusHours(1);
+ LocalDateTime temperatureTime = value.minusHours(2);
+ LocalDateTime predictionTime = value.plusHours(2);
+ Integer predictionHour = predictionTime.getHour();
+ Map<String, Object> devices = new HashMap<>();
+ devices.put("sensorKeys", Arrays.asList("e7", "e12"));
+ devices.put("macList", macList);
+ devices.put("time", illuminationTime);
+ List<Map<String, Object>> hourlyIlluminationData = historyHourlyService.getHourlySensorDataToCalculateO3(devices);
+ XxlJobLogger.log("insertHistoryO3Table-IlluminationDataCount:" + hourlyIlluminationData.size());
+ devices.put("time", temperatureTime);
+ List<Map<String, Object>> hourlytemperatureData = historyHourlyService.getHourlySensorDataToCalculateO3(devices);
+ XxlJobLogger.log("insertHistoryO3Table-temperatureDataCount:" + hourlytemperatureData.size());
+ List<Map<String, Object>> hourlyDataList = new ArrayList<>();
+ BigDecimal temperature;
+ BigDecimal illumination;
+ BigDecimal pressure = new BigDecimal("0");
+ BigDecimal humidity = new BigDecimal("0");
+ BigDecimal windSpeed = new BigDecimal("0");
+ try {
+ for (Map<String, Object> IlluminationData : hourlyIlluminationData) {
+ if (!ObjectUtils.isEmpty(IlluminationData)) {
+ Map<String, Object> hourlyDataMap = new LinkedHashMap<>();
+ hourlyDataMap.put("mac", IlluminationData.get("mac"));
+ hourlyDataMap.put("time", predictionTime);
+ Organization organizationInfoByMac = organizationService.getOrganizationInfoByMac(IlluminationData.get("mac").toString());
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("mac", IlluminationData.get("mac"));
+ parameters.put("villageCode", organizationInfoByMac.getVillageCode());
+ parameters.put("townCode", organizationInfoByMac.getTownCode());
+ parameters.put("areaCode", organizationInfoByMac.getAreaCode());
+ parameters.put("cityCode", organizationInfoByMac.getCityCode());
+ parameters.put("provinceCode", organizationInfoByMac.getProvinceCode());
+ List<Map<String, Object>> weatherByMac = weatherUtil.getWeatherByMac(parameters);
+ for (Map<String, Object> stringObjectMap : weatherByMac) {
+ Integer mjHour = Integer.valueOf(stringObjectMap.get("hour").toString());
+ if (predictionHour == mjHour) {
+ pressure = new BigDecimal(stringObjectMap.get("pressure").toString());
+ humidity = new BigDecimal(stringObjectMap.get("humidity").toString());
+ windSpeed = new BigDecimal(stringObjectMap.get("windSpeed").toString());
+ }
+ }
+ JSONObject jo = new JSONObject(true);
+ JSONArray jsonArray = new JSONArray();
+ for (Map<String, Object> temperatureData : hourlytemperatureData) {
+ if (!ObjectUtils.isEmpty(temperatureData)) {
+ if (IlluminationData.get("mac").equals(temperatureData.get("mac"))) {
+ if (temperatureData.get("e7") != null) {
+ temperature = new BigDecimal(temperatureData.get("e7").toString());
+ } else {
+ temperature = new BigDecimal("0");
+ }
+ if (temperatureData.get("e12") != null) {
+ illumination = new BigDecimal(IlluminationData.get("e12").toString());
+ } else {
+ illumination = new BigDecimal("0");
+ }
+ temperatureRatio = new BigDecimal("8").add(new BigDecimal("32").divide(temperature.subtract(new BigDecimal("12")), 4, BigDecimal.ROUND_HALF_UP));
+ BigDecimal bignum1 = temperature.multiply(temperatureRatio);
+ BigDecimal bignum2 = illumination.divide(new BigDecimal(illuminationRatio), 4, BigDecimal.ROUND_HALF_UP);
+ BigDecimal bignum3 = new BigDecimal(pressureRatio1).divide(pressure.subtract(new BigDecimal(pressureRatio2)), 4, BigDecimal.ROUND_HALF_UP);
+ BigDecimal index = humidity.subtract(new BigDecimal("100")).divide(new BigDecimal("50"), 4, BigDecimal.ROUND_HALF_UP);
+ double indexDouble = Math.pow(0.8, index.doubleValue());
+ humidityRatio = new BigDecimal("1").add(BigDecimal.valueOf(indexDouble));
+ BigDecimal bignum4 = humidity.multiply(humidityRatio);
+ BigDecimal bignum5 = windSpeed.multiply(new BigDecimal(windSpeedRatio));
+ BigDecimal result = bignum1.add(bignum2).add(bignum3).subtract(bignum4).subtract(bignum5).setScale(4, BigDecimal.ROUND_HALF_UP);
+ jo.put("e15", result);
+ jo.put("e6", humidity);
+ jo.put("e7", temperature);
+ jo.put("e12", illumination);
+ jo.put("e18", windSpeed);
+ jo.put("e28", pressure);
+ }
+ }
+ }
+ jsonArray.add(jo);
+ hourlyDataMap.put("json", jsonArray.get(0).toString());
+ hourlyDataList.add(hourlyDataMap);
+ }
+ }
+ if (!CollectionUtils.isEmpty(hourlyDataList)) {
+ historyHourlyService.insertHistoryO3Hourly(hourlyDataList);
+ ReturnT returnT = new ReturnT(200, "������������������");
+ return returnT;
+ }
+ } catch (Exception e) {
+ XxlJobLogger.log("insertHistoryO3TableException:" + e.getMessage());
+ logger.error(e.getMessage());
+ e.printStackTrace();
+ }
+ ReturnT returnT = new ReturnT(500, "������������������");
+ return returnT;
+ }
+
}
--
Gitblit v1.8.0