From 0bb98d4377e5b894a2338b7726846b978450e187 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Jan 2022 10:31:33 +0800
Subject: [PATCH] update
---
screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java | 3 ++-
screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java | 3 ++-
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java | 3 ++-
screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java | 3 ++-
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 3 ++-
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java | 3 ++-
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 3 ++-
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 3 ++-
8 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index 1738813..5ec2a3e 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -71,8 +71,9 @@
.collect(Collectors.groupingBy(o -> o.get("city_code").toString()));
List<CityAqiDaily> cityAqiDailies = new ArrayList<>();
- CityAqiDaily cityAqiDaily = new CityAqiDaily();
+
data.forEach((cityCode, value) -> {
+ CityAqiDaily cityAqiDaily = new CityAqiDaily();
Map<String, Object> jsonMap = new HashMap<>();
cityAqiDaily.setCityCode(Integer.parseInt(cityCode));
cityAqiDaily.setTime(start);
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
index 18ddf7c..b67eebf 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
@@ -82,8 +82,9 @@
.collect(Collectors.groupingBy(CityAqiMonthly::getCityCode));
List<CityAqiMonthly> cityAqiMonthlyList = new ArrayList<>();
- CityAqiMonthly cityAqiMonthly = new CityAqiMonthly();
+
data.forEach((cityCode, value) -> {
+ CityAqiMonthly cityAqiMonthly = new CityAqiMonthly();
Map<String, Object> jsonMap = new HashMap<>();
cityAqiMonthly.setCityCode(Integer.parseInt(cityCode));
cityAqiMonthly.setTime(start);
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 b76c55a..15cc9f4 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
@@ -72,8 +72,9 @@
List<CityConfigAqi> list = cityConfigAqiService.list(wrapper);
List<CityAqi> cityAqiList = new ArrayList<>();
- CityAqi cityAqi = new CityAqi();
+
for (CityConfigAqi cityConfigAqi : list) {
+ CityAqi cityAqi = new CityAqi();
Integer cityCode = cityConfigAqi.getCityCode();
Map<String, Object> data;
try {
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java
index d4a5204..cdda6d5 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java
@@ -84,8 +84,9 @@
.collect(Collectors.groupingBy(CityAqiYearly::getCityCode));
List<CityAqiYearly> cityAqiYearlyList = new ArrayList<>();
- CityAqiYearly cityAqiYearly = new CityAqiYearly();
+
data.forEach((cityCode, value) -> {
+ CityAqiYearly cityAqiYearly = new CityAqiYearly();
Map<String, Object> jsonMap = new HashMap<>();
cityAqiYearly.setCityCode(Integer.parseInt(cityCode));
cityAqiYearly.setTime(start);
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 feb87a3..db3f836 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
@@ -50,8 +50,9 @@
List<CityConfigWeatherForecast> list = cityConfigWeatherForecastService.list(wrapper);
List<CityWeatherForecast> cityWeatherForecasts = new ArrayList<>();
- CityWeatherForecast cityWeatherForecast = new CityWeatherForecast();
+
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);
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java
index f4420af..1872469 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java
@@ -53,8 +53,9 @@
List<CityConfigWeather> list = cityConfigWeatherService.list(wrapper);
List<CityWeather> cityWeathers = new ArrayList<>();
- CityWeather cityWeather = new CityWeather();
+
for (CityConfigWeather cityConfigWeather : list) {
+ CityWeather cityWeather = new CityWeather();
Integer cityCode = cityConfigWeather.getCityCode();
Integer locationId = cityConfigWeather.getLocationId();
Map<String, Object> data = restTemplate.getForObject("https://api.qweather.com/v7/weather/now?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, locationId);
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 2615ac9..bbf30cb 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
@@ -130,9 +130,10 @@
Map<Date, List<Integer>> hours = DateUtils.getBeforeAndAfterHourDate(nextDay);
List<Forecast> forecastList = new ArrayList<>();
- Forecast forecast = new Forecast();
+
Map<String, Object> forecastMap = new HashMap<>();
for (Object obj : cityCodes) {
+ Forecast forecast = new Forecast();
Integer cityCode = Integer.parseInt(obj.toString());
forecast.setCityCode(cityCode);
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
index 25914b1..08d9f08 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -72,8 +72,9 @@
String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
List<HistoryAqi> historyAqis = new ArrayList<>();
- HistoryAqi historyAqi = new HistoryAqi();
+
for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
+ HistoryAqi historyAqi = new HistoryAqi();
String guid = govMonitorPoint.getGuid();
ResponseEntity<String> response;
try {
--
Gitblit v1.8.0