From 5586964c3e63f95c9e460a6a3d85d7dca408e096 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 10 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 3a8312e..5f96938 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;
@@ -24,8 +22,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+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;
@@ -67,34 +67,74 @@
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);
Map<String, Object> value = new HashMap<>();
- value.put(Constants.SENSOR_CODE_PM25, map.get("pm2_5"));
- value.put(Constants.SENSOR_CODE_PM10, map.get("pm10"));
- value.put(Constants.SENSOR_CODE_SO2, map.get("so2"));
- value.put(Constants.SENSOR_CODE_NO2, map.get("no2"));
- value.put(Constants.SENSOR_CODE_CO, Double.parseDouble(map.get("co").toString()));
- value.put(Constants.SENSOR_CODE_O3, map.get("o3"));
+ Object pm2_5 = map.get("pm2_5");
+ Object pm10 = map.get("pm10");
+ Object so2 = map.get("so2");
+ Object no2 = map.get("no2");
+ Object co = map.get("co");
+ Object o3 = map.get("o3");
+ if (!ObjectUtils.isEmpty(pm2_5)) {
+ value.put(Constants.SENSOR_CODE_PM25, pm2_5);
+ }
+
+ if (!ObjectUtils.isEmpty(pm10)) {
+ value.put(Constants.SENSOR_CODE_PM10, pm10);
+ }
+
+ if (!ObjectUtils.isEmpty(so2)) {
+ value.put(Constants.SENSOR_CODE_SO2, so2);
+ }
+
+ if (!ObjectUtils.isEmpty(no2)) {
+ value.put(Constants.SENSOR_CODE_NO2, no2);
+ }
+
+ if (!ObjectUtils.isEmpty(co)) {
+ value.put(Constants.SENSOR_CODE_CO, Double.parseDouble(co.toString()));
+ }
+
+ if (!ObjectUtils.isEmpty(o3)) {
+ value.put(Constants.SENSOR_CODE_O3, o3);
+ }
+
//aqi������������redis
redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
}
}
+
+ @Override
+ public HistoryAqi getHistoryApiByTimeAndGuid(String guid, String time) {
+ QueryWrapper<HistoryAqi> wrapper_historyAqi = new QueryWrapper<>();
+ wrapper_historyAqi.eq("guid",guid).eq("time",time);
+ HistoryAqi historyAqi = new HistoryAqi();
+ if (historyAqiMapper.selectCount(wrapper_historyAqi)==1){
+ historyAqi = historyAqiMapper.selectOne(wrapper_historyAqi);
+ }
+ return historyAqi;
+ }
}
--
Gitblit v1.8.0