From 247e9203e92423930bee311af18c355400a9b57b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 01 Apr 2024 10:01:55 +0800
Subject: [PATCH] fix:和风数据修复

---
 screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java |   21 +++++++++++++++++++--
 1 files changed, 19 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 e011e20..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;
             }

--
Gitblit v1.8.0