From 9d91dc402f279630eaa100024fd3b1542fbeb41c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 22 Dec 2021 11:04:41 +0800
Subject: [PATCH] 分钟，5分钟，小时表存入非本月数据bug修复
---
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 a89dba2..a9e9121 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
@@ -9,13 +9,14 @@
import com.moral.api.service.CityWeatherService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -40,6 +41,9 @@
@Autowired
private RestTemplate restTemplate;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
@Override
public void insertCityWeather() {
//������������������
@@ -47,7 +51,7 @@
wrapper.select("city_code", "location_id").eq("is_delete", Constants.NOT_DELETE);
List<CityConfig> list = cityConfigService.list(wrapper);
for (CityConfig cityConfig : list) {
- String cityCode = cityConfig.getCityCode();
+ Integer cityCode = cityConfig.getCityCode();
Integer locationId = cityConfig.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");
@@ -61,17 +65,20 @@
cityWeather.setValue(JSONObject.toJSONString(now));
Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
cityWeather.setTime(time);
+ //���������������
cityWeatherMapper.insert(cityWeather);
+ //������redis
+ redisTemplate.opsForHash().put(RedisConstants.CITY_WEATHER, String.valueOf(cityCode), now);
}
}
@Override
public CityWeather getDataByCityCodeAndTime(String cityCode, String time) {
QueryWrapper wrapper_cityWeather = new QueryWrapper();
- wrapper_cityWeather.eq("city_code",cityCode);
- wrapper_cityWeather.eq("time",time);
+ wrapper_cityWeather.eq("city_code", cityCode);
+ wrapper_cityWeather.eq("time", time);
CityWeather cityWeather = new CityWeather();
- if (cityWeatherMapper.selectCount(wrapper_cityWeather)==1){
+ if (cityWeatherMapper.selectCount(wrapper_cityWeather) == 1) {
cityWeather = cityWeatherMapper.selectOne(wrapper_cityWeather);
}
return cityWeather;
--
Gitblit v1.8.0