From 2df06d95978eedeb1d8c63411bcae7e42a964fca Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 8 Jan 2025 15:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csharmonic/service/impl/DataServiceImpl.java | 8 ++++----
 1 file changed, 4 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 71cd5de..0308600 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
@@ -243,11 +243,11 @@ public class DataServiceImpl implements IDataService {
                             unit = "k" + item2.getUnit();
                             break;
                         default:
-                            re = statisticalDataDTO.getValue();
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
                             unit = item2.getUnit();
                             break;
                     }
-                    vo.setAvgValue(Double.valueOf(df.format(re)));
+                    vo.setAvgValue(Objects.equals(re,3.14159) ? 3.14159 : Double.parseDouble(df.format(re)));
                 }else {
                     if (Objects.nonNull(statisticalDataDTO)) {
                         re = statisticalDataDTO.getValue();
@@ -270,10 +270,10 @@ public class DataServiceImpl implements IDataService {
                             re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt / ct / 1000;
                             break;
                         default:
-                            re = statisticalDataDTO.getValue();
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
                             break;
                     }
-                    vo.setAvgValue(Double.valueOf(df.format(re)));
+                    vo.setAvgValue(Objects.equals(re,3.14159) ? 3.14159 : Double.parseDouble(df.format(re)));
                 }else {
                     if (Objects.nonNull(statisticalDataDTO)) {
                         re = statisticalDataDTO.getValue();