From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
index 89244a6..d1bd8ab 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java
@@ -189,6 +189,8 @@
                 int size = weatherMaps.size();
                 Double tempAvg = calculateAvg(weatherMaps, "temp");
                 Double o3Avg = calculateAvg(weatherMaps, "O3");
+                if(tempAvg == null || o3Avg == null)
+                    continue;
                 Double sum1 = calculateProduct(weatherMaps, "temp", "O3");
                 Double sum2 = calculateProduct(weatherMaps, "temp", "temp");
                 double b = (sum1 - size * tempAvg * o3Avg) / (sum2 - size * tempAvg * tempAvg);

--
Gitblit v1.8.0