From 8b0501f73b6d92b611c7df74535566f65faa7d7b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Sep 2020 13:51:15 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 0184499..82f4b1a 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -744,9 +744,17 @@
map.put("COC", map.get("CO").toString());
map.remove("CO");
}
- if ((!map.containsKey("PM25C")) && map.containsKey("PM2_5")) {
- map.put("PM25C", map.get("PM2_5").toString().replace("\\.", ""));
- map.remove("PM2_5");
+ if ((!map.containsKey("PM25C")) && (map.containsKey("PM2_5")||map.containsKey("PM25"))) {
+ if (map.get("PM2_5") != null) {
+ map.put("PM25C", map.get("PM2_5").toString().replace("\\.", ""));
+ map.remove("PM2_5");
+ break;
+ }
+ if(map.get("PM25") != null){
+ map.put("PM25C", map.get("PM25").toString().replace("\\.", ""));
+ map.remove("PM25");
+ break;
+ }
}
if ((!map.containsKey("PM10C")) && map.containsKey("PM10")) {
map.put("PM10C", map.get("PM10").toString().replace("\\.", ""));
--
Gitblit v1.8.0