From e7c06474bff33963a090b0a268ed5c983e3fd29d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 18 Jan 2022 09:26:32 +0800
Subject: [PATCH] 督办单图片删除修改
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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..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;
@@ -81,9 +82,11 @@
String body = response.getBody();
Map<String, Object> data = JSONObject.parseObject(body, Map.class);
Map<String, Object> map = (Map<String, Object>) data.get("data");
- HistoryAqi historyAqi = new HistoryAqi();
+ if (ObjectUtils.isEmpty(map)) {
+ continue;
+ }
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