From 21ff37f83f27364720bb890cce4b6aa7ffc40562 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 21 Oct 2020 16:53:27 +0800
Subject: [PATCH] 报警

---
 src/main/java/com/moral/service/impl/WeatherServiceImpl.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index a370f6e..8c83b3b 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -797,20 +797,28 @@
 
                     if (rhour == nowHour) {
                         Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
-                        double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
-                        resultMap.put("goodValue", v);
+                        if (sumO3Map != null) {
+                            double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
+                            resultMap.put("goodValue", v);
+                        }
                     } else if (rhour == nowHour + 1) {
                         Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
-                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2;
-                        resultMap.put("goodValue", String.valueOf(Math.round(v)));
+                        if (sumO3Map != null) {
+                            double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2;
+                            resultMap.put("goodValue", String.valueOf(Math.round(v)));
+                        }
                     } else if (rhour == nowHour + 2) {
                         Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
-                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3;
-                        resultMap.put("goodValue", String.valueOf(Math.round(v)));
+                        if (sumO3Map != null) {
+                            double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3;
+                            resultMap.put("goodValue", String.valueOf(Math.round(v)));
+                        }
                     } else if (rhour == nowHour + 3) {
                         Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
-                        double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4;
-                        resultMap.put("goodValue", String.valueOf(Math.round(v)));
+                        if (sumO3Map != null) {
+                            double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4;
+                            resultMap.put("goodValue", String.valueOf(Math.round(v)));
+                        }
                     }
                 }
             }

--
Gitblit v1.8.0