From ed91204e6b70b3d295bc5aecb5ae45dd2a1a2a45 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Oct 2021 09:26:24 +0800
Subject: [PATCH] 国控站aqi数据为空时不insert
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 73287e2..2a0e2c1 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
@@ -2,11 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.CityAqiConfig;
import com.moral.api.entity.GovMonitorPoint;
import com.moral.api.entity.HistoryAqi;
import com.moral.api.mapper.HistoryAqiMapper;
-import com.moral.api.service.CityAqiConfigService;
import com.moral.api.service.GovMonitorPointService;
import com.moral.api.service.HistoryAqiService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,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;
@@ -68,21 +67,26 @@
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;
}
String body = response.getBody();
Map<String, Object> data = JSONObject.parseObject(body, Map.class);
Map<String, Object> map = (Map<String, Object>) data.get("data");
+ if (ObjectUtils.isEmpty(map)) {
+ continue;
+ }
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