From 119473a723ff1f3acf077b14bccac4f16b418458 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 12 Nov 2021 13:50:30 +0800
Subject: [PATCH] 去除打印信息
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 be072d3..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);
}
@@ -83,8 +83,14 @@
Map<String, Object> map = (Map<String, Object>) data.get("data");
Map<String, Object> aqi = (Map<String, Object>) map.get("aqi");
- aqi.put("PM2_5", aqi.remove("pm25C"));
aqi.remove("pm25");
+ aqi.remove("pm10");
+ aqi.remove("so2");
+ aqi.remove("no2");
+ aqi.remove("co");
+ aqi.remove("o3");
+
+ aqi.put("PM2_5", aqi.remove("pm25C"));
aqi.put("PM10", aqi.remove("pm10C"));
aqi.put("SO2", aqi.remove("so2C"));
aqi.put("NO2", aqi.remove("no2C"));
@@ -131,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