From 994d4b65f78e5121680de31b14161003620d746e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 16 Nov 2022 10:45:22 +0800
Subject: [PATCH] 修改张家港国控站数据
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 88b5cff..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;
@@ -55,6 +60,7 @@
@Autowired
private RedisTemplate redisTemplate;
+ //������aqi������������������������������������������������������������CityID���������������������������������
@Override
public void insertCityAqi() {
//pubtime=08���������������07-08������������������������������������������������07���
@@ -80,7 +86,7 @@
.collect(Collectors.toList());
queryWrapper.select("city_code", "time", "value")
- .ge("time", DateUtils.dateToDateString(start))
+ .ge("time", start)
.in("city_code", cityCodes);
List<Map<String, Object>> selectMaps = cityAqiMapper.selectMaps(queryWrapper);
@@ -92,13 +98,24 @@
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();
Integer cityCode = cityConfigAqi.getCityCode();
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;
}
@@ -126,6 +143,9 @@
//o3���������������
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));
--
Gitblit v1.8.0