From d620e65b30db7bc43db71d26fbce36548819eebc Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 28 Dec 2021 09:42:19 +0800
Subject: [PATCH] 修改特殊设备更新接口
---
screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 bd6d9f2..e5bcd7d 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
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.CityConfig;
+import com.moral.api.entity.CityConfigWeather;
import com.moral.api.entity.CityWeather;
import com.moral.api.mapper.CityWeatherMapper;
-import com.moral.api.service.CityConfigService;
+import com.moral.api.service.CityConfigWeatherService;
import com.moral.api.service.CityWeatherService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -36,7 +36,7 @@
private CityWeatherMapper cityWeatherMapper;
@Autowired
- private CityConfigService cityConfigService;
+ private CityConfigWeatherService cityConfigWeatherService;
@Autowired
private RestTemplate restTemplate;
@@ -47,12 +47,12 @@
@Override
public void insertCityWeather() {
//������������������
- QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
+ QueryWrapper<CityConfigWeather> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "location_id").eq("is_delete", Constants.NOT_DELETE);
- List<CityConfig> list = cityConfigService.list(wrapper);
- for (CityConfig cityConfig : list) {
- Integer cityCode = cityConfig.getCityCode();
- Integer locationId = cityConfig.getLocationId();
+ List<CityConfigWeather> list = cityConfigWeatherService.list(wrapper);
+ for (CityConfigWeather cityConfigWeather : list) {
+ 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();
@@ -68,7 +68,7 @@
//���������������
cityWeatherMapper.insert(cityWeather);
//������redis
- redisTemplate.opsForHash().put(RedisConstants.CITY_WEATHER, cityCode, now);
+ redisTemplate.opsForHash().put(RedisConstants.CITY_WEATHER, String.valueOf(cityCode), now);
}
}
@@ -83,4 +83,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