From 43c631ad573535f4434caf19423824d4bd3f8ca7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 19 Jul 2023 13:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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..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
@@ -130,12 +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) {
Integer cityCode = Integer.parseInt(obj.toString());
-
- forecast.setCityCode(cityCode);
//������
List<CityWeatherForecast> cityWeatherForecasts = cityForecast.get(cityCode);
@@ -171,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