From 72086303e261a8f0971299f26409baea4baa18cb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 15 Nov 2021 15:41:04 +0800
Subject: [PATCH] 国控站数据time改为开始时间

---
 screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 10664c8..c8be3d9 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -59,7 +59,7 @@
         Date time = DateUtils.dataToTimeStampTime(now, DateUtils.yyyy_MM_dd_HH_EN);
 
         Date start = null;
-        if (DateUtils.getHour(time) == 0 || DateUtils.getHour(time) >= 8) {
+        if (DateUtils.getHour(time) >= 7) {
             start = DateUtils.addHours(time, -7);
         }
 
@@ -137,9 +137,8 @@
             sixParamMap.put(Constants.SENSOR_CODE_CO, aqi.get("CO"));
             sixParamMap.put(Constants.SENSOR_CODE_O3, aqi.get("O3"));
             AQI aqiAndPollutant = AQIUtils.hourlyAQI(sixParamMap);
-            if (!ObjectUtils.isEmpty(aqiAndPollutant.getPrimaryPollutantNames())) {
-                aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());
-            }
+            aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());
+
 
             CityAqi cityAqi = new CityAqi();
             cityAqi.setCityCode(cityCode);

--
Gitblit v1.8.0