From 7438064a85a63d46e210ce37e63c4ca823d52f63 Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Thu, 04 Jul 2024 09:50:02 +0800
Subject: [PATCH] fix:补充提交
---
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
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 ef84f87..1c19097 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
@@ -14,9 +14,13 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -38,24 +42,31 @@
@Autowired
private CityConfigWeatherService cityConfigWeatherService;
- @Autowired
- private RestTemplate restTemplate;
@Autowired
private RedisTemplate redisTemplate;
+ //������������������������������������������������������������������
@Override
public void insertCityWeather() {
+ RestTemplate restTemplate = new RestTemplate(
+ new HttpComponentsClientHttpRequestFactory()); // ������HttpClient���������GZIP
+ restTemplate.getMessageConverters().set(1,
+ new StringHttpMessageConverter(StandardCharsets.UTF_8));
//������������������
QueryWrapper<CityConfigWeather> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "location_id").eq("is_delete", Constants.NOT_DELETE);
List<CityConfigWeather> list = cityConfigWeatherService.list(wrapper);
+
+ List<CityWeather> cityWeathers = new ArrayList<>();
+
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);
+ //Map<String, Object> data = restTemplate.getForObject("https://api.qweather.com/v7/weather/now?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, locationId);
+ Map<String, Object> data = restTemplate.getForObject("https://devapi.qweather.com/v7/weather/now?location="+locationId+"&key=2430ab9e636c4950a686fbd84e3ccb3a", Map.class);
Map<String, Object> now = (Map<String, Object>) data.get("now");
- CityWeather cityWeather = new CityWeather();
cityWeather.setCityCode(cityCode);
//������km/h->m/s
double windSpeed = Double.parseDouble(now.get("windSpeed").toString());
@@ -65,11 +76,12 @@
cityWeather.setValue(JSONObject.toJSONString(now));
Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
cityWeather.setTime(time);
- //���������������
- cityWeatherMapper.insert(cityWeather);
+ cityWeathers.add(cityWeather);
//������redis
redisTemplate.opsForHash().put(RedisConstants.CITY_WEATHER, String.valueOf(cityCode), now);
}
+ cityWeatherMapper.insertCityWeather(cityWeathers);
+
}
@Override
@@ -83,4 +95,12 @@
}
return cityWeather;
}
+
+ @Override
+ public List<CityWeather> getCityWeather() {
+ String time = DateUtils.getDateStringOfHour(-1, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+ QueryWrapper<CityWeather> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("time", time);
+ return cityWeatherMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.8.0