From f3452e172e49eb8b588bec6c81a7e08b458fc4bd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Apr 2022 09:44:36 +0800
Subject: [PATCH] 企业整顿清单
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 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 15cc9f4..7d589da 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
@@ -19,7 +19,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;
@@ -29,6 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.OptionalDouble;
+import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
/**
@@ -54,6 +60,7 @@
@Autowired
private RedisTemplate redisTemplate;
+ //������aqi������������������������������������������������������������CityID���������������������������������
@Override
public void insertCityAqi() {
//pubtime=08���������������07-08������������������������������������������������07���
@@ -71,7 +78,33 @@
wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
List<CityConfigAqi> list = cityConfigAqiService.list(wrapper);
+ //������������������������������������������������
+ Map<Integer, List<Map<String, Object>>> cityData = null;
+ if (start != null) {
+ QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
+ List<Integer> cityCodes = list.stream().map(CityConfigAqi::getCityCode)
+ .collect(Collectors.toList());
+
+ queryWrapper.select("city_code", "time", "value")
+ .ge("time", start)
+ .in("city_code", cityCodes);
+ List<Map<String, Object>> selectMaps = cityAqiMapper.selectMaps(queryWrapper);
+
+ //���city_code������
+ cityData = selectMaps.stream()
+ .collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString())));
+ }
+
+
List<CityAqi> cityAqiList = new ArrayList<>();
+
+
+ String url = "http://aliv13.data.moji.com/whapi/json/alicityweather/aqi";
+ String appcode = "31b6ea8f804a4472be3b633cfee44849";
+ HttpHeaders httpHeaders = new HttpHeaders();
+ httpHeaders.add("Authorization", "APPCODE " + appcode);
+ //������������
+ LinkedMultiValueMap<String, Object> requestParams = new LinkedMultiValueMap<>();
for (CityConfigAqi cityConfigAqi : list) {
CityAqi cityAqi = new CityAqi();
@@ -79,7 +112,10 @@
Map<String, Object> data;
try {
//������������������������������
- data = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityConfigAqi.getCityId());
+ requestParams.set("cityId", cityConfigAqi.getCityId());
+ HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(requestParams, httpHeaders);
+ ResponseEntity<String> response = restTemplate.postForEntity(url, httpEntity, String.class);
+ data = JSONObject.parseObject(response.getBody(), Map.class);
} catch (Exception e) {
continue;
}
@@ -105,12 +141,12 @@
aqi.put("AQI", aqi.remove("value"));
//o3���������������
- if (start != null) {
- QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("time", "value")
- .eq("city_code", cityCode)
- .ge("time", DateUtils.dateToDateString(start));
- List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
+ if (cityData != null) {
+ List<Map<String, Object>> cityAqis = cityData.get(cityCode);
+ if (cityAqis == null) {
+ cityAqis = new ArrayList<>();
+ }
+
Map<String, Object> params = new HashMap<>();
params.put("time", DateUtils.dateToDateString(dataTime, DateUtils.yyyy_MM_dd_HH_mm_ss_S_EN));
params.put("value", JSONObject.toJSONString(aqi));
--
Gitblit v1.8.0