From 6450fec60b8dc7e6d31779bcfe3b23b3f665ebaf Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 28 Dec 2021 15:08:45 +0800
Subject: [PATCH] screen-api            更新单位转换代码

---
 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