From 6fab467ce6ddad58de462f0094f86b044dfee94c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Aug 2020 11:50:54 +0800
Subject: [PATCH] 更新天气预测
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 106f60d..3d8bf05 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -338,6 +338,7 @@
hashMap.put("TVOC", "");
hashMap.put("altitude", "");
hashMap.put("vegetation", "");
+ hashMap.put("river", "");
hashMap.put("AQI", "");
hashMap.put("SO2C", "");
hashMap.put("NO2C", "");
@@ -535,14 +536,13 @@
}
}
}
-
for (int i = list.size(); i < foreList.size(); i++) {
Map<String, Object> map = foreList.get(i);
resultList.add(map);
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("time", map.get("time").toString());
hashMap.put("type", "������");
- hashMap.put("city", parameters.get("city").toString());
+ hashMap.put("city", parameters.get("name").toString());
resultList.add(hashMap);
}
@@ -569,7 +569,7 @@
map.put("SO2C", map.get("SO2").toString());
}
if ((!map.containsKey("NO2C")) && map.containsKey("NO2")) {
- map.put("SO2C", map.get("SO2").toString());
+ map.put("NO2C", map.get("NO2C").toString());
}
if ((!map.containsKey("O3C")) && map.containsKey("O3")) {
map.put("O3C", map.get("O3").toString());
@@ -577,8 +577,8 @@
if ((!map.containsKey("COC")) && map.containsKey("CO")) {
map.put("COC", map.get("CO").toString());
}
- if ((!map.containsKey("PM25C")) && map.containsKey("PM25")) {
- map.put("PM25C", map.get("PM25").toString());
+ if ((!map.containsKey("PM25C")) && map.containsKey("PM2_5")) {
+ map.put("PM25C", map.get("PM2_5").toString());
}
if ((!map.containsKey("PM10C")) && map.containsKey("PM10")) {
map.put("PM10C", map.get("PM10").toString());
@@ -616,7 +616,7 @@
hashMap.put("cityCode",Integer.valueOf(map.get("code").toString()));
Map<String, Object> jsonMap = new HashMap<>();
for (String key : map.keySet()) {
- if (!key.equals("city") && !key.equals("time") && !key.equals("type") && !key.equals("fxTime")) {
+ if (!key.equals("city") && !key.equals("time") && !key.equals("type") && !key.equals("fxTime")&&!key.equals("code")) {
String value = map.get(key).toString();
jsonMap.put(key, value);
}
--
Gitblit v1.8.0