From f976feb7ae339c006af150b30802f7edfc8d966f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 09:05:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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..89244a6 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
@@ -22,12 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.OptionalDouble;
+import java.util.*;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
@@ -133,13 +128,10 @@
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);
+ List<CityWeatherForecast> cityWeatherForecasts = Objects.isNull(cityForecast.get(cityCode))?new ArrayList<>():cityForecast.get(cityCode);
//������������������������������
List<CityWeather> cityWeathers = cityHistoryWeather.get(cityCode);
@@ -172,6 +164,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();
@@ -211,7 +205,10 @@
}
}
}
- forecastMapper.insertForecast(forecastList);
+ if(forecastList.size()>0){
+ forecastMapper.insertForecast(forecastList);
+ }
+
}
private Double calculateAvg(List<Map<String, Object>> list, String param) {
--
Gitblit v1.8.0