From bb6856a82a588f05040b0410a9747ae8029bb3be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 10:06:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..2637f8f 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
@@ -17,6 +17,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -44,18 +45,22 @@
@Autowired
private RedisTemplate redisTemplate;
+ //������������������������������������������������������������������
@Override
public void insertCityWeather() {
//������������������
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> 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 +70,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 +89,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