From 90d352e2af12d96ea09b0062d8cb6e0d184cbb3f Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 Jan 2022 10:31:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java | 5 ++---
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java | 2 +-
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 28 ++++++++++++++++++++++------
3 files changed, 25 insertions(+), 10 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 15cc9f4..88b5cff 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
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Map;
import java.util.OptionalDouble;
+import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
/**
@@ -71,6 +72,24 @@
wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
List<CityConfigAqi> list = cityConfigAqiService.list(wrapper);
+ //������������������������������������������������
+ Map<Integer, List<Map<String, Object>>> cityData = null;
+ if (start != null) {
+ QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
+ List<Integer> cityCodes = list.stream().map(CityConfigAqi::getCityCode)
+ .collect(Collectors.toList());
+
+ queryWrapper.select("city_code", "time", "value")
+ .ge("time", DateUtils.dateToDateString(start))
+ .in("city_code", cityCodes);
+ List<Map<String, Object>> selectMaps = cityAqiMapper.selectMaps(queryWrapper);
+
+ //���city_code������
+ cityData = selectMaps.stream()
+ .collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString())));
+ }
+
+
List<CityAqi> cityAqiList = new ArrayList<>();
for (CityConfigAqi cityConfigAqi : list) {
@@ -105,12 +124,9 @@
aqi.put("AQI", aqi.remove("value"));
//o3���������������
- if (start != null) {
- QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("time", "value")
- .eq("city_code", cityCode)
- .ge("time", DateUtils.dateToDateString(start));
- List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
+ if (cityData != null) {
+ List<Map<String, Object>> cityAqis = cityData.get(cityCode);
+
Map<String, Object> params = new HashMap<>();
params.put("time", DateUtils.dateToDateString(dataTime, DateUtils.yyyy_MM_dd_HH_mm_ss_S_EN));
params.put("value", JSONObject.toJSONString(aqi));
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java
index db3f836..ef6d160 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java
@@ -52,7 +52,6 @@
List<CityWeatherForecast> cityWeatherForecasts = new ArrayList<>();
for (CityConfigWeatherForecast cityConfigWeatherForecast : list) {
- CityWeatherForecast cityWeatherForecast = new CityWeatherForecast();
Integer cityCode = cityConfigWeatherForecast.getCityCode();
Integer locationId = cityConfigWeatherForecast.getLocationId();
Map<String, Object> data = restTemplate.getForObject("https://api.qweather.com/v7/weather/72h?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, locationId);
@@ -62,6 +61,7 @@
String dayTime = fxTime.split("T")[0];
if (dayTime.equals(nextTime)) {
String hourTime = fxTime.substring(0, 17).replaceAll("T", " ");
+ CityWeatherForecast cityWeatherForecast = new CityWeatherForecast();
cityWeatherForecast.setCityCode(cityCode);
cityWeatherForecast.setTime(DateUtils.getDate(hourTime, DateUtils.yyyy_MM_dd_HH_EN));
cityWeatherForecast.setValue(JSONObject.toJSONString(hourlyMap));
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
index bbf30cb..1850370 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
@@ -133,10 +133,7 @@
Map<String, Object> forecastMap = new HashMap<>();
for (Object obj : cityCodes) {
- Forecast forecast = new Forecast();
Integer cityCode = Integer.parseInt(obj.toString());
-
- forecast.setCityCode(cityCode);
//������
List<CityWeatherForecast> cityWeatherForecasts = cityForecast.get(cityCode);
@@ -172,6 +169,8 @@
}
for (CityWeatherForecast cityWeatherForecast : cityWeatherForecasts) {
+ Forecast forecast = new Forecast();
+ forecast.setCityCode(cityCode);
Date time = cityWeatherForecast.getTime();
Map<String, Object> value = JSONObject.parseObject(cityWeatherForecast.getValue(), Map.class);
String weather = value.get("text").toString();
--
Gitblit v1.8.0