From 5158c660013d52524559d4435f27b5e63d3221b7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 17 Nov 2021 13:54:25 +0800
Subject: [PATCH] screen-api 更改饼状图接口
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
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 5c4d849..2398263 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,9 @@
import com.moral.api.service.CityAqiDailyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityAqiService;
+import com.moral.constant.Constants;
+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;
@@ -16,6 +19,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
@@ -44,7 +48,8 @@
@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");
String format = DateUtils.yyyy_MM_dd_EN;
Date now = new Date();
//���������������������
@@ -69,21 +74,17 @@
CityAqiDaily cityAqiDaily = new CityAqiDaily();
cityAqiDaily.setCityCode(Integer.parseInt(cityCode));
cityAqiDaily.setTime(start);
-
- //���������������������������
- Double o3OfDay = AmendUtils.o3OfDay(value);
- if (o3OfDay != null) {
- jsonMap.put("o3", o3OfDay);
+ //O3���������������������������������������
+ if (!ObjectUtils.isEmpty(value)) {
+ Double o3OfDay = AmendUtils.o3OfDay(value);
+ if (o3OfDay != null) {
+ jsonMap.put("O3", o3OfDay);
+ }
}
sensors.forEach(sensor -> {
OptionalDouble optionalDouble = value.parallelStream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
- //������������������
- if ("o3".equals(sensor)) {
- return null;
- }
-
Object sensorValue = dataValue.get(sensor);
if (ObjectUtils.isEmpty(sensorValue)) {
return null;
@@ -94,7 +95,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);
@@ -103,6 +104,19 @@
}
});
+ //���aqi,���������������������
+ Map<String, Object> sixParamMap = new HashMap<>();
+ sixParamMap.put(Constants.SENSOR_CODE_PM25, jsonMap.get("PM2_5"));
+ sixParamMap.put(Constants.SENSOR_CODE_PM10, jsonMap.get("PM10"));
+ sixParamMap.put(Constants.SENSOR_CODE_SO2, jsonMap.get("SO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_NO2, jsonMap.get("NO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_CO, jsonMap.get("CO"));
+ sixParamMap.put(Constants.SENSOR_CODE_O3, jsonMap.get("O3"));
+
+ AQI aqi = AQIUtils.dailyAQI(sixParamMap);
+ jsonMap.put("AQI", aqi.getAQIValue());
+ jsonMap.put("primaryPollutant", aqi.getPrimaryPollutantNames());
+
//���������������������
Double compositeIndex = ComprehensiveIndexUtils.dailyData(jsonMap);
jsonMap.put("compositeIndex", compositeIndex);
--
Gitblit v1.8.0