From 3c689f6b593a12a142543b6e922ee8c39c8c4e8a Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 01 Apr 2024 16:58:15 +0800
Subject: [PATCH] fix：臭氧任务执行
---
screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java | 2 ++
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherForecastServiceImpl.java | 14 +++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
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 805b311..4f0699f 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
@@ -64,32 +64,36 @@
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);
- Map<String, Object> data = restTemplate.getForObject("https://devapi.qweather.com/v7/weather/24h?location="+locationId+"&key=2430ab9e636c4950a686fbd84e3ccb3a", Map.class);
+ Map<String, Object> data = restTemplate.getForObject("https://api.qweather.com/v7/weather/72h?key=5c27e3442bee4a0891eae34afca125f3&gzip=n&location={1}", Map.class, locationId);
//Map<String, Object> data = restTemplate.getForObject(url,Map.class);
List<Map<String, Object>> hourly = (List<Map<String, Object>>) data.get("hourly");
for (Map<String, Object> hourlyMap : hourly) {
String fxTime = hourlyMap.get("fxTime").toString();
String dayTime = fxTime.split("T")[0];
- //if (dayTime.equals(nextTime)) {
+ 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));
cityWeatherForecasts.add(cityWeatherForecast);
- //}
+ }
}
}
cityWeatherForecastMapper.insertCityWeatherForecast(cityWeatherForecasts);
}
public static void main(String[] args) {
- String url = "https://devapi.qweather.com/v7/weather/24h?location=101010100&key=2430ab9e636c4950a686fbd84e3ccb3a"; //���������������������������
RestTemplate restTemplate = new RestTemplate(
new HttpComponentsClientHttpRequestFactory()); // ������HttpClient���������GZIP
restTemplate.getMessageConverters().set(1,
new StringHttpMessageConverter(StandardCharsets.UTF_8));
- Map<String, Object> data = restTemplate.getForObject(url,Map.class);
+ /* String url = "https://devapi.qweather.com/v7/weather/24h?location=101010100&key=2430ab9e636c4950a686fbd84e3ccb3a"; //���������������������������
+
+ Map<String, Object> data = restTemplate.getForObject(url,Map.class);*/
+ /*RestTemplate restTemplate = new RestTemplate();*/
+ Map<String, Object> data = restTemplate.getForObject("https://api.qweather.com/v7/weather/72h?key=5c27e3442bee4a0891eae34afca125f3&gzip=n&location={1}", Map.class, 101010100);
+
List<Map<String, Object>> hourly = (List<Map<String, Object>>) data.get("hourly");
int i = 0;
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 89244a6..d1bd8ab 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
@@ -189,6 +189,8 @@
int size = weatherMaps.size();
Double tempAvg = calculateAvg(weatherMaps, "temp");
Double o3Avg = calculateAvg(weatherMaps, "O3");
+ if(tempAvg == null || o3Avg == null)
+ continue;
Double sum1 = calculateProduct(weatherMaps, "temp", "O3");
Double sum2 = calculateProduct(weatherMaps, "temp", "temp");
double b = (sum1 - size * tempAvg * o3Avg) / (sum2 - size * tempAvg * tempAvg);
--
Gitblit v1.8.0