From 48e498136c8784ee79a698da2c852ca3aa0549ab Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Dec 2021 15:10:41 +0800
Subject: [PATCH] 行业贡献率，区域贡献率
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 312d895..062e655 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
@@ -81,9 +81,12 @@
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(time);
+ historyAqi.setTime(DateUtils.addHours(time, -1));
//���������������
historyAqi.setValue(JSONObject.toJSONString(map));
historyAqiMapper.insert(historyAqi);
@@ -123,4 +126,23 @@
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;
+ }
+
+ @Override
+ public List<HistoryAqi> getHistoryAqi() {
+ String time = DateUtils.getDateStringOfHour(-1, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+ QueryWrapper<HistoryAqi> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("time", time);
+ return historyAqiMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.8.0