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 ++---
1 files changed, 2 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 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