From 04cdb50b13a90601119eae2f2e366c3ebc3b0dfa Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 27 Dec 2024 11:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csharmonic/service/impl/DataServiceImpl.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
index 2577cf3..71cd5de 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
@@ -249,9 +249,11 @@ public class DataServiceImpl implements IDataService {
                     }
                     vo.setAvgValue(Double.valueOf(df.format(re)));
                 }else {
-                    re = statisticalDataDTO.getValue();
+                    if (Objects.nonNull(statisticalDataDTO)) {
+                        re = statisticalDataDTO.getValue();
+                        vo.setAvgValue(Double.valueOf(df.format(re)));
+                    }
                     unit = item2.getUnit();
-                    vo.setAvgValue(Double.valueOf(df.format(re)));
                 }
             }
         } else {
@@ -273,8 +275,10 @@ public class DataServiceImpl implements IDataService {
                     }
                     vo.setAvgValue(Double.valueOf(df.format(re)));
                 }else {
-                    re = statisticalDataDTO.getValue();
-                    vo.setAvgValue(Double.valueOf(df.format(re)));
+                    if (Objects.nonNull(statisticalDataDTO)) {
+                        re = statisticalDataDTO.getValue();
+                        vo.setAvgValue(Double.valueOf(df.format(re)));
+                    }
                 }
             } else {
                 vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));