From 0359860dbc5de19f3d099ff549af0b4c48a08221 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 10 Dec 2021 14:31:27 +0800
Subject: [PATCH] 经纬度实体类，计算中心点工具类，修改热力图接口经纬度顺序
---
screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
index 80b0a02..7ddf17e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
@@ -14,6 +14,7 @@
import com.moral.api.service.OrganizationService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
+import com.moral.pojo.AQI;
import com.moral.util.AQIUtils;
import com.moral.util.RegionCodeUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -492,9 +493,9 @@
if (!ObjectUtils.isEmpty(PM2_5)){
AQIMap.put("a05024",O3_1h);
}
- Map<String,Object> AQIResultMap = new HashMap<>();
+ AQI aqi = new AQI();
if (AQIMap.size()!=0){
- AQIResultMap = AQIUtils.hourlyAqi_pollutant(AQIMap);
+ aqi = AQIUtils.hourlyAQI(AQIMap);
}
Map<String,Object> avgMap = new HashMap<>();
avgMap.put("a34004_"+"0",PM2_5);
@@ -504,14 +505,14 @@
avgMap.put("a21005_"+"0",CO);
avgMap.put("a05024_"+"0",O3_1h);
avgMap.put("O3_8h_"+"0",O3_8h);
- if (!ObjectUtils.isEmpty(AQIResultMap.get("aqi"))){
- avgMap.put("aqi",AQIResultMap.get("aqi"));
+ if (!ObjectUtils.isEmpty(aqi.getAQIValue())){
+ avgMap.put("aqi",aqi.getAQIValue());
}else {
avgMap.put("aqi","");
}
- if (!ObjectUtils.isEmpty(AQIResultMap.get("pollutant"))){
- if (Integer.parseInt(AQIResultMap.get("aqi").toString())>50){
- String pollutant = AQIResultMap.get("pollutant").toString();
+ if (!ObjectUtils.isEmpty(aqi.getPrimaryPollutantNames())){
+ if (Integer.parseInt(aqi.getAQIValue().toString())>50){
+ String pollutant = aqi.getPrimaryPollutantNames().toString();
pollutant = pollutant.replace("[","");
pollutant = pollutant.replace("]","");
avgMap.put("pollutant",pollutant);
--
Gitblit v1.8.0