From 1b440360d4e36a6844c4e557b01da29e5d151ff2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 06 Sep 2022 17:20:45 +0800
Subject: [PATCH] 千灯数据转发bug修改
---
src/main/java/com/moral/task/AQIDataInsertTask.java | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/moral/task/AQIDataInsertTask.java b/src/main/java/com/moral/task/AQIDataInsertTask.java
index b612d25..8236f2d 100644
--- a/src/main/java/com/moral/task/AQIDataInsertTask.java
+++ b/src/main/java/com/moral/task/AQIDataInsertTask.java
@@ -1,12 +1,23 @@
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,30 +25,30 @@
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 {
+
@Resource
private AQIService aqiService;
+
@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();
+ 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 ;
+ 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());}}
@@ -49,11 +60,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;
@@ -67,15 +84,15 @@
}
}
Map<String, Object> parameters = new HashMap<>();
- parameters.put("time",pubtime);
- parameters.put("data",data.toString());
- parameters.put("code",cityAqiConfig.get("city_code"));
+ parameters.put("time", pubtime);
+ parameters.put("data", data.toString());
+ parameters.put("code", cityAqiConfig.get("city_code"));
if (!ObjectUtils.isEmpty(data)) {
try {
- int i=aqiService.insertAQIData(parameters);
- if (i>0){
+ int i = aqiService.insertAQIData(parameters);
+ if (i > 0) {
returnT = new ReturnT(200, " ���������������������");
- }else {
+ } else {
returnT = new ReturnT(500, " ���������������������");
}
} catch (Exception e) {
@@ -89,11 +106,23 @@
map.put("e11", data.containsKey("SO2C") ? data.get("SO2C").toString() : data.get("SO2").toString());
map.put("e15", data.containsKey("O3C") ? data.get("O3C").toString() : data.get("O3").toString());
map.put("e16", data.containsKey("NO2C") ? data.get("NO2C").toString() : data.get("NO2").toString());
- redisTemplate.opsForHash().putAll("aqi_" + cityAqiConfig.get("city_code"),map);
+ if (data.get("CITYNAME").equals("���������")){
+ map.put("e1", data.get("PM2_5").toString());
+ }
+ redisTemplate.opsForHash().putAll("aqi_" + cityAqiConfig.get("city_code"), map);
}
}
}
return returnT;
}
+ @XxlJob("insertStationData")
+ public ReturnT insertStationData(String param) {
+ int state = aqiService.insertStationData();
+ if (state == 200) {
+ return new ReturnT(200, "������������");
+ } else {
+ return new ReturnT(500, "������������������������������������������������");
+ }
+ }
}
--
Gitblit v1.8.0