From d866a0c52c419156941801ea0008643d1c7f0e04 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 05 Jan 2022 16:18:59 +0800
Subject: [PATCH] 新建污染警报小时表定时任务
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 9cfadbd..141b779 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -61,7 +61,7 @@
//������������������time������������������
Date dataTime = DateUtils.addHours(time, -1);
Date start = null;
- if (DateUtils.getHour(time) >= 8) {
+ if (DateUtils.getHour(time) >= 8 || DateUtils.getHour(time) == 0) {
start = DateUtils.addHours(time, -8);
}
@@ -70,6 +70,7 @@
wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
List<CityConfigAqi> list = cityConfigAqiService.list(wrapper);
+ CityAqi cityAqi = new CityAqi();
for (CityConfigAqi cityConfigAqi : list) {
Integer cityCode = cityConfigAqi.getCityCode();
Map<String, Object> data;
@@ -112,7 +113,7 @@
params.put("value", JSONObject.toJSONString(aqi));
cityAqis.add(params);
if (cityAqis.size() >= 6) {
- OptionalDouble average = cityAqis.parallelStream().flatMapToDouble(v -> {
+ OptionalDouble average = cityAqis.stream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
double o3 = Double.parseDouble(dataValue.get("O3").toString());
return DoubleStream.of(o3);
@@ -142,7 +143,6 @@
aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());
- CityAqi cityAqi = new CityAqi();
cityAqi.setCityCode(cityCode);
cityAqi.setTime(dataTime);
cityAqi.setValue(JSONObject.toJSONString(aqi));
--
Gitblit v1.8.0