From 8f5416a1e507fe24c151648982e391fead13ffdd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 15:57:22 +0800
Subject: [PATCH] 省内倒数排名增加time字段
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 82 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 9 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 02600fc..1f91041 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
@@ -4,19 +4,26 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.CityAqi;
import com.moral.api.entity.CityConfig;
-import com.moral.api.entity.CityWeather;
import com.moral.api.mapper.CityAqiMapper;
import com.moral.api.service.CityAqiService;
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.AQIUtils;
+import com.moral.util.AmendUtils;
+import com.moral.util.ComprehensiveIndexUtils;
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;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -40,24 +47,81 @@
@Autowired
private RestTemplate restTemplate;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ @Autowired
+
+
@Override
public void insertCityAqi() {
//������������������
QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
- wrapper.select("city_code", "location_id").eq("is_delete", Constants.NOT_DELETE);
+ wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
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 locationId = cityConfig.getLocationId();
- Map<String, Object> data = restTemplate.getForObject("https://api.qweather.com/v7/air/now?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, locationId);
- Map<String, Object> now = (Map<String, Object>) data.get("now");
+ Integer cityCode = cityConfig.getCityCode();
+ Map<String, Object> data;
+ try {
+ //������������������������������
+ data = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityConfig.getCityId());
+ } catch (Exception e) {
+ continue;
+ }
+ if (ObjectUtils.isEmpty(data)) {
+ continue;
+ }
+
+ Map<String, Object> map = (Map<String, Object>) data.get("data");
+ Map<String, Object> aqi = (Map<String, Object>) map.get("aqi");
+ aqi.put("pm2_5", aqi.remove("pm25C"));
+ aqi.remove("pm25");
+ aqi.put("pm10", aqi.remove("pm10C"));
+ 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("aqi", aqi.remove("value"));
+
+ //o3���������������
+ //���������������������������o3������
+ QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("time", "value").eq("city_code", cityCode);
+ List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
+ List<Map<String, Object>> o3_8H = AmendUtils.getO3_8H(cityAqis);
+ if (!ObjectUtils.isEmpty(o3_8H)) {
+ for (Map<String, Object> o3Map : o3_8H) {
+ String hourTime = o3Map.get("time").toString();
+ if (DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN).equals(hourTime)) {
+ o3Map.get("o3");
+ aqi.put("o3_8h", o3Map.get("o3"));
+ break;
+ }
+ }
+ }
+
+ //������������������
+ Map<String, Object> temp = new HashMap<>(aqi);
+ temp.put("o3", temp.get("o3_8h"));
+ Double compositeIndex = ComprehensiveIndexUtils.dailyData(temp);
+ aqi.put("compositeIndex", compositeIndex);
+
+
+ //���������������������
+ Map<String, Object> pollutant = AQIUtils.cityAqiPollutant(aqi);
+ if (!ObjectUtils.isEmpty(pollutant)) {
+ aqi.putAll(pollutant);
+ }
+
+
CityAqi cityAqi = new CityAqi();
cityAqi.setCityCode(cityCode);
- now.put("pm2_5", now.get("pm2p5"));
- cityAqi.setValue(JSONObject.toJSONString(now));
- Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
cityAqi.setTime(time);
+ cityAqi.setValue(JSONObject.toJSONString(aqi));
cityAqiMapper.insert(cityAqi);
+ //������redis
+ redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, cityCode.toString(), aqi);
}
}
}
--
Gitblit v1.8.0