From 96d7cf8eb72810dfa5921a585d64b5ce9909d416 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 16 Dec 2020 16:53:25 +0800
Subject: [PATCH] 北京疾控中心设备掉线报警邮件发送

---
 src/main/java/com/moral/task/AQIDataInsertTask.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/moral/task/AQIDataInsertTask.java b/src/main/java/com/moral/task/AQIDataInsertTask.java
index b612d25..76ccc6f 100644
--- a/src/main/java/com/moral/task/AQIDataInsertTask.java
+++ b/src/main/java/com/moral/task/AQIDataInsertTask.java
@@ -1,12 +1,22 @@
 package com.moral.task;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.moral.service.AQIService;
 import com.moral.util.HttpUtils;
 import com.moral.util.WxMappingJackson2HttpMessageConverter;
-
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
+
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.util.EntityUtils;
@@ -14,9 +24,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 @Component
 public class AQIDataInsertTask {
@@ -25,7 +32,7 @@
     @Resource
     private RedisTemplate redisTemplate;
     @XxlJob("insertData")
-    public ReturnT insertData(){
+    public ReturnT insertData(String param){
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         RestTemplate restTemplate = new RestTemplate();
         restTemplate.getMessageConverters().add(new WxMappingJackson2HttpMessageConverter());
@@ -49,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