From 4fbbd4ff938875997a84914c0310149851ced122 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:09:51 +0800
Subject: [PATCH] 从history表获取数据改为从history天表获取数据
---
src/main/java/com/moral/task/AQIDataInsertTask.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/task/AQIDataInsertTask.java b/src/main/java/com/moral/task/AQIDataInsertTask.java
index 71491d3..f9c3d4f 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,15 +32,17 @@
@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());
Date pubtime = DateUtils.truncate(new Date(),Calendar.HOUR);
List<Map<String,Object>> CityAqiConfigs =aqiService.getCityAqiConfig();
ReturnT returnT = null;
+
for (Map<String, Object> cityAqiConfig : CityAqiConfigs) {
String entity = null ;
+ Collection<Object> values = null;
Map<String, Object> data = null;
try {
HttpResponse response = HttpUtils.doGet("https://api.epmap.org", "/api/v1/air/city", "GET",
@@ -42,15 +51,28 @@
);
entity = EntityUtils.toString(response.getEntity());
JSONObject json = JSON.parseObject(entity);
+
data = (Map<String, Object>) json.get("data");
if (!ObjectUtils.isEmpty(data)) {
+ values = data.values();
pubtime = format.parse(data.get("pubtime").toString());
- }else {
- continue;
}
} catch (Exception e) {
e.printStackTrace();
}
+ if (ObjectUtils.isEmpty(entity) || ObjectUtils.isEmpty(values) || values.contains("None")) {
+ 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;
+ } else {
+ data = (Map<String, Object>) ((Map) mjMap.get("data")).get("aqi");
+ data.put("aqi", data.remove("value"));
+ data.put("PM2_5", data.remove("pm25"));
+ pubtime = new Date(Long.valueOf(data.get("pubtime").toString()));
+ String string = JSONObject.toJSONString(data).toUpperCase();
+ data = (Map<String, Object>) JSON.parse(string);
+ }
+ }
Map<String, Object> parameters = new HashMap<>();
parameters.put("time",pubtime);
parameters.put("data",data.toString());
--
Gitblit v1.8.0