From ae188e492c18c213da4ead70abb66c406c97b908 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 14 Oct 2021 13:45:46 +0800
Subject: [PATCH] 国控站aqi接口加入time参数

---
 screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
index 7f337ff..312d895 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -25,6 +25,7 @@
 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;
@@ -66,12 +67,14 @@
         queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE);
         //������������������������������������������
         List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
+        Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
+        String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
         for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
             String guid = govMonitorPoint.getGuid();
             ResponseEntity<String> response;
             try {
                 //������������������������������
-                response = restTemplate.exchange("http://chinair.market.alicloudapi.com/api/v1/air_all/station_realtime?guid={1}", HttpMethod.GET, requestEntity, String.class, guid);
+                response = restTemplate.exchange("http://chinair.market.alicloudapi.com/api/v1/air_all/station_realtime?guid={1}&pubtime={2}", HttpMethod.GET, requestEntity, String.class, guid, timeStr);
             } catch (Exception e) {
                 continue;
             }
@@ -80,7 +83,7 @@
             Map<String, Object> map = (Map<String, Object>) data.get("data");
             HistoryAqi historyAqi = new HistoryAqi();
             historyAqi.setGuid(guid);
-            historyAqi.setTime(DateUtils.getDate(map.get("pubtime").toString(), DateUtils.yyyy_MM_dd_HH_mm_ss_EN));
+            historyAqi.setTime(time);
             //���������������
             historyAqi.setValue(JSONObject.toJSONString(map));
             historyAqiMapper.insert(historyAqi);

--
Gitblit v1.8.0