From f60aae617c859a972469f1fbbfea82d7aec939f8 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 12 Nov 2021 13:46:46 +0800
Subject: [PATCH] screen-api 获取近24小时AQI数据添加年月日
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 eb93995..8a3048c 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
@@ -176,10 +176,10 @@
//������������������������
cityAqis.sort(Comparator.comparing(CityAqi::getTime));
}
- //������������������,map���key���HH:mm������������������value���aqi���������
+ //������������������,map���key���yyyy-MM-dd HH:mm������������������value���aqi���������
Map<String, Object> result = new LinkedHashMap<>();
for (CityAqi aqi : cityAqis) {
- String key = DateUtils.dateToDateString(aqi.getTime(), "HH:mm");
+ String key = DateUtils.dateToDateString(aqi.getTime(), "yyyy-MM-dd HH:mm");
String allDataJson = aqi.getValue();
if (allDataJson == null) {
result.put(key, "");
@@ -349,7 +349,7 @@
List<String> primaryPollutantNames = aqi.getPrimaryPollutantNames();
String primaryPollutant = "";
if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
- primaryPollutant = primaryPollutantNames.toString().replace("[", "").replace("]", "");
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
}
dataMap.put("primaryPollutant", primaryPollutant);
@@ -387,7 +387,7 @@
List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");
String primaryPollutant = "";
if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
- primaryPollutant = primaryPollutantNames.toString().replace("[", "").replace("]", "");
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
}
value.put("primaryPollutant", primaryPollutant);
value.remove("pubtime");
@@ -414,7 +414,7 @@
List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");
String primaryPollutant = "";
if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
- primaryPollutant = primaryPollutantNames.toString().replace("[", "").replace("]", "");
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
}
value.put("primaryPollutant", primaryPollutant);
//���������
@@ -966,6 +966,4 @@
}
return result;
}
-
-
}
--
Gitblit v1.8.0