From b68490b0aa57d405d81bff6e99379031022cac3e Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 29 Oct 2021 16:13:18 +0800
Subject: [PATCH] screen-api 增加获取城市天气接口
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 41 ++++++++++++-----------------------------
1 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 310246f..1250a50 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -9,10 +9,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityConfigService;
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.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;
@@ -20,7 +22,6 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* <p>
@@ -42,6 +43,12 @@
@Autowired
private RestTemplate restTemplate;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ @Autowired
+
+
@Override
public void insertCityAqi() {
//������������������
@@ -50,7 +57,7 @@
List<CityConfig> list = cityConfigService.list(wrapper);
Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
for (CityConfig cityConfig : list) {
- String cityCode = cityConfig.getCityCode();
+ Integer cityCode = cityConfig.getCityCode();
Map<String, Object> data;
try {
//������������������������������
@@ -70,39 +77,15 @@
aqi.put("so2", aqi.remove("so2C"));
aqi.put("no2", aqi.remove("no2C"));
aqi.put("co", aqi.remove("coC"));
- aqi.put("o3", aqi.remove("o3c"));
+ aqi.put("o3", aqi.remove("o3C"));
aqi.put("aqi", aqi.remove("value"));
CityAqi cityAqi = new CityAqi();
cityAqi.setCityCode(cityCode);
cityAqi.setTime(time);
cityAqi.setValue(JSONObject.toJSONString(aqi));
cityAqiMapper.insert(cityAqi);
+ //������redis
+ redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, cityCode.toString(), aqi);
}
- }
-
- @Override
- public void insertCityAqiDaily() {
- String format = DateUtils.yyyy_MM_dd_EN;
- Date now = new Date();
- //���������������������
- Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), format);
- //���������������������
- Date end = DateUtils.dataToTimeStampTime(now, format);
- //������������������aqi������������
- QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
- wrapper.select("city_code", "value")
- .ge("time", DateUtils.dateToDateString(start))
- .lt("time", DateUtils.dateToDateString(end));
- List<Map<String, Object>> dailyData = cityAqiMapper.selectMaps(wrapper);
-
- if (dailyData.size() == 0) {
- return;
- }
- //���city_code������
- Map<String, List<Map<String, Object>>> data = dailyData.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("city_code")));
- data.forEach((cityCode, value) -> {
-
- });
-
}
}
--
Gitblit v1.8.0