From 267c20d552dbce24bce0a0d59a106f49f879ab62 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Nov 2021 15:33:27 +0800
Subject: [PATCH] city_aqi，city_aqi_daily 6参转大写
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 4 ++--
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 26 +++++++++++++-------------
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 24 ++++++++++++++++++++----
3 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 944e560..466b0c5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -89,7 +89,7 @@
Date date = (Date) forecastDatum.get("time");
String value = forecastDatum.get("value").toString();
Map<String, Object> data = JSONObject.parseObject(value, Map.class);
- Object o3 = data.get("o3");
+ Object o3 = data.get("O3");
if (i == DateUtils.getHour(date) * 2) {
if (!ObjectUtils.isEmpty(o3)) {
map.put("O3", o3);
@@ -104,7 +104,7 @@
Date date = (Date) measuredDatum.get("time");
String value = measuredDatum.get("value").toString();
Map<String, Object> data = JSONObject.parseObject(value, Map.class);
- Object o3 = data.get("o3");
+ Object o3 = data.get("O3");
if (i == (DateUtils.getHour(date) * 2 + 1)) {
if (!ObjectUtils.isEmpty(o3)) {
map.put("O3", o3);
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index 92b325d..28a0fc0 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -8,6 +8,8 @@
import com.moral.api.service.CityAqiDailyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityAqiService;
+import com.moral.pojo.AQI;
+import com.moral.util.AQIUtils;
import com.moral.util.AmendUtils;
import com.moral.util.ComprehensiveIndexUtils;
import com.moral.util.DateUtils;
@@ -45,7 +47,7 @@
@Override
public void insertCityAqiDaily() {
- List<String> sensors = Arrays.asList("pm2_5", "pm10", "so2", "no2", "co", "o3", "aqi");
+ List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2", "CO", "O3", "AQI");
String format = DateUtils.yyyy_MM_dd_EN;
Date now = new Date();
//���������������������
@@ -77,10 +79,12 @@
//������������������������0������������O3������������������������������1���-8���
value.removeIf(map -> ((Date) map.get("time")).getTime() == start.getTime());
+ //���������������������������������������
Double o3OfDay = AmendUtils.o3OfDay(value);
if (o3OfDay != null) {
- jsonMap.put("o3", o3OfDay);
+ jsonMap.put("O3", o3OfDay);
}
+
//������������������������������������
tempValue.removeIf(o -> ((Date) o.get("time")).getTime() == end.getTime());
@@ -88,7 +92,12 @@
OptionalDouble optionalDouble = tempValue.parallelStream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
//������������������
- if ("o3".equals(sensor)) {
+ if ("O3".equals(sensor)) {
+ return null;
+ }
+
+ //aqi������������
+ if ("AQI".equals(sensor)) {
return null;
}
@@ -102,7 +111,7 @@
if (optionalDouble.isPresent()) {
//���������������������
double sciCal;
- if ("co".equals(sensor)) {
+ if ("CO".equals(sensor)) {
sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 1);
} else {
sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 0);
@@ -111,10 +120,17 @@
}
});
+ //���aqi������
+ AQI aqi = AQIUtils.dailyAQI(jsonMap);
+ jsonMap.put("AQI", aqi.getAQIValue());
+
//���������������������
Double compositeIndex = ComprehensiveIndexUtils.dailyData(jsonMap);
jsonMap.put("compositeIndex", compositeIndex);
+ //���������������������
+ jsonMap.put("primaryPollutant", aqi.getPrimaryPollutantNames());
+
cityAqiDaily.setValue(JSONObject.toJSONString(jsonMap));
cityAqiDailyMapper.insert(cityAqiDaily);
});
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 64e23c0..1af915e 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
@@ -104,39 +104,39 @@
.ge("time", DateUtils.dateToDateString(start));
List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
Map<String, Object> params = new HashMap<>();
- params.put("time", DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_ss_S_EN));
+ params.put("time", DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_S_EN));
params.put("value", JSONObject.toJSONString(aqi));
cityAqis.add(params);
if (cityAqis.size() >= 6) {
OptionalDouble average = cityAqis.parallelStream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
- double o3 = Double.parseDouble(dataValue.get("o3").toString());
+ double o3 = Double.parseDouble(dataValue.get("O3").toString());
return DoubleStream.of(o3);
}).average();
if (average.isPresent()) {
- double o3_8h = AmendUtils.sciCal(average.getAsDouble(), 0);
- aqi.put("o3_8h", o3_8h);
+ double O3_8H = AmendUtils.sciCal(average.getAsDouble(), 0);
+ aqi.put("O3_8H", O3_8H);
}
}
}
//������������������
Map<String, Object> temp = new HashMap<>(aqi);
- temp.put("o3", temp.get("o3_8h"));
+ temp.put("O3", temp.get("O3_8H"));
Double compositeIndex = ComprehensiveIndexUtils.dailyData(temp);
aqi.put("compositeIndex", compositeIndex);
//���������������������
- Map<String,Object> sixParamMap = new HashMap<>();
- sixParamMap.put("a34002",aqi.get("PM10"));
- sixParamMap.put("a34004",aqi.get("PM2_5"));
- sixParamMap.put("a21004",aqi.get("NO2"));
- sixParamMap.put("a21005",aqi.get("CO"));
- sixParamMap.put("a05024",aqi.get("O3"));
- sixParamMap.put("a21026",aqi.get("SO2"));
+ Map<String, Object> sixParamMap = new HashMap<>();
+ sixParamMap.put("a34002", aqi.get("PM10"));
+ sixParamMap.put("a34004", aqi.get("PM2_5"));
+ sixParamMap.put("a21004", aqi.get("NO2"));
+ sixParamMap.put("a21005", aqi.get("CO"));
+ sixParamMap.put("a05024", aqi.get("O3"));
+ sixParamMap.put("a21026", aqi.get("SO2"));
AQI aqiAndPollutant = AQIUtils.hourlyAQI(sixParamMap);
if (!ObjectUtils.isEmpty(aqiAndPollutant.getPrimaryPollutantNames())) {
- aqi.put("pollutant",aqiAndPollutant.getPrimaryPollutantNames());
+ aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());
}
CityAqi cityAqi = new CityAqi();
--
Gitblit v1.8.0