From 21306302aab4d1cad3d990d84b765263addb9b19 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 08 Nov 2021 17:01:37 +0800
Subject: [PATCH] aqi排名详情首要污染物转为string类型
---
screen.iml | 21 +++++++++++----------
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 19 ++++++++++++++++++-
2 files changed, 29 insertions(+), 11 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..eb93995 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.toString().replace("[", "").replace("]", "");
+ }
+ 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.toString().replace("[", "").replace("]", "");
+ }
+ 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.toString().replace("[", "").replace("]", "");
+ }
+ value.put("primaryPollutant", primaryPollutant);
//���������
QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
queryWrapper.select("area_name")
diff --git a/screen.iml b/screen.iml
index aa08dcf..586fc57 100644
--- a/screen.iml
+++ b/screen.iml
@@ -8,8 +8,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -1030,14 +1028,14 @@
<orderEntry type="library" name="Maven: com.github.xiaoymin:swagger-bootstrap-ui:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3.1" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.0" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.0" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.0" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.0" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.0" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.0" level="project" />
+ <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
@@ -1080,6 +1078,8 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.14.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.kaptcha:kaptcha:2.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
@@ -1089,5 +1089,6 @@
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.5.9" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.aviator:aviator:5.2.5" level="project" />
+ <orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.8.0