From f3452e172e49eb8b588bec6c81a7e08b458fc4bd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Apr 2022 09:44:36 +0800
Subject: [PATCH] 企业整顿清单

---
 screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 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 7f337ff..2cb03bc 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
@@ -25,6 +25,8 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,6 +55,8 @@
     @Autowired
     private RedisTemplate redisTemplate;
 
+
+    //���������aqi���������������������������������������������������������API--���������������
     @Override
     @Transactional
     public void insertHistoryAqi() {
@@ -66,24 +70,33 @@
         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);
+
+        List<HistoryAqi> historyAqis = new ArrayList<>();
+
         for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
+            HistoryAqi historyAqi = new HistoryAqi();
             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");
-            HistoryAqi historyAqi = new HistoryAqi();
+            if (ObjectUtils.isEmpty(map)) {
+                continue;
+            }
             historyAqi.setGuid(guid);
-            historyAqi.setTime(DateUtils.getDate(map.get("pubtime").toString(), DateUtils.yyyy_MM_dd_HH_mm_ss_EN));
+            historyAqi.setTime(DateUtils.addHours(time, -1));
             //���������������
             historyAqi.setValue(JSONObject.toJSONString(map));
-            historyAqiMapper.insert(historyAqi);
+
+            historyAqis.add(historyAqi);
 
             Map<String, Object> value = new HashMap<>();
             Object pm2_5 = map.get("pm2_5");
@@ -119,5 +132,26 @@
             //aqi������������redis
             redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
         }
+        //���������������
+        historyAqiMapper.insertHistoryAqi(historyAqis);
+    }
+
+    @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