From 3ec35029adfb63e79ad17bf351317768e687ec2b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:25 +0800
Subject: [PATCH] city_aqi月均值，年均值update
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 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 5f96938..80e1b89 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
@@ -69,6 +69,7 @@
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);
+ HistoryAqi historyAqi = new HistoryAqi();
for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
String guid = govMonitorPoint.getGuid();
ResponseEntity<String> response;
@@ -84,9 +85,8 @@
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);
@@ -130,11 +130,19 @@
@Override
public HistoryAqi getHistoryApiByTimeAndGuid(String guid, String time) {
QueryWrapper<HistoryAqi> wrapper_historyAqi = new QueryWrapper<>();
- wrapper_historyAqi.eq("guid",guid).eq("time",time);
+ wrapper_historyAqi.eq("guid", guid).eq("time", time);
HistoryAqi historyAqi = new HistoryAqi();
- if (historyAqiMapper.selectCount(wrapper_historyAqi)==1){
+ 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