From 6a8b22c541448dbe15eb1b046dbf456131c2f325 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 12 Nov 2021 11:38:25 +0800
Subject: [PATCH] screen-api 添加获取今年天气污染情况饼状图接口
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 ac464a6..f38abc8 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
@@ -346,7 +346,12 @@
sixParamMap.put(Constants.SENSOR_CODE_O3, dataMap.get("O3"));
AQI aqi = AQIUtils.dailyAQI(sixParamMap);
dataMap.put("AQI", aqi.getAQIValue());
- dataMap.put("primaryPollutant", aqi.getPrimaryPollutantNames());
+ List<String> primaryPollutantNames = aqi.getPrimaryPollutantNames();
+ String primaryPollutant = "";
+ if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
+ }
+ dataMap.put("primaryPollutant", primaryPollutant);
//������������������������������,O3������������O3_8H������
Map<String, Object> compositeIndexMap = new HashMap<>(dataMap);
@@ -379,6 +384,12 @@
List<Map<String, Object>> hourData = cityAqiMapper.selectMaps(wrapper);
for (Map<String, Object> hourDatum : hourData) {
Map<String, Object> value = JSONObject.parseObject((String) hourDatum.get("value"), Map.class);
+ List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");
+ String primaryPollutant = "";
+ if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
+ }
+ value.put("primaryPollutant", primaryPollutant);
value.remove("pubtime");
value.remove("rank");
result.add(value);
@@ -400,6 +411,12 @@
List<Map<String, Object>> dayData = cityAqiDailyService.listMaps(wrapper);
for (Map<String, Object> dayDatum : dayData) {
Map<String, Object> value = JSONObject.parseObject((String) dayDatum.get("value"), Map.class);
+ List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");
+ String primaryPollutant = "";
+ if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
+ }
+ value.put("primaryPollutant", primaryPollutant);
//���������
QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
queryWrapper.select("area_name")
@@ -949,6 +966,4 @@
}
return result;
}
-
-
}
--
Gitblit v1.8.0