From dcd1f53f7cde02a411d9767e6edbe612e4178d3d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 25 Jan 2021 10:45:01 +0800
Subject: [PATCH] 和风天气接口更改失败状态显示

---
 src/main/java/com/moral/task/AQIDataInsertTask.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/task/AQIDataInsertTask.java b/src/main/java/com/moral/task/AQIDataInsertTask.java
index f9c3d4f..dbc332b 100644
--- a/src/main/java/com/moral/task/AQIDataInsertTask.java
+++ b/src/main/java/com/moral/task/AQIDataInsertTask.java
@@ -44,7 +44,7 @@
             String entity = null ;
             Collection<Object> values = null;
             Map<String, Object> data = null;
-            try {
+         /*   try {
                 HttpResponse response = HttpUtils.doGet("https://api.epmap.org", "/api/v1/air/city", "GET",
                         new HashMap<String, String>() {{put("Authorization", "APPCODE " + "31b6ea8f804a4472be3b633cfee44849");}},
                         new HashMap<String, String>() {{put("city", cityAqiConfig.get("city_name").toString());}}
@@ -56,11 +56,17 @@
                 if (!ObjectUtils.isEmpty(data)) {
                     values = data.values();
                     pubtime = format.parse(data.get("pubtime").toString());
+                    int hours = pubtime.getHours();
+                    Calendar calendar = Calendar.getInstance();
+                    int hour = calendar.get(Calendar.HOUR_OF_DAY);
+                    if (hour != hours){
+                        pubtime = null;
+                    }
                 }
             } catch (Exception e) {
                 e.printStackTrace();
-            }
-            if (ObjectUtils.isEmpty(entity) || ObjectUtils.isEmpty(values) || values.contains("None")) {
+            }*/
+            if (ObjectUtils.isEmpty(entity) || ObjectUtils.isEmpty(values) || values.contains("None") || pubtime == null) {
                 Map<String, Object> mjMap = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityAqiConfig.get("city_id"));
                 if (ObjectUtils.isEmpty(mjMap)) {
                     continue;

--
Gitblit v1.8.0