From 3a97f01383c884039262a003db3f029fbee16caf Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Sat, 13 Dec 2025 11:11:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=B8=82=E5=90=88=E6=A0=BC=E7=8E=87?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GridServiceImpl.java         | 63 ++++++++++++++++---
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
index b74720931..ef9d90904 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
@@ -890,7 +890,7 @@ public class GridServiceImpl implements IGridService {
         }
     }
 
-    public AssessDetailVo getAssessData(String deptId, String deptName, List<String> lineList, List<RStatAssesDPO> list1, List<PQSComAssesPO> list2, List<RStatLimitRateDPO> list3) {
+    public AssessDetailVo   getAssessData(String deptId, String deptName, List<String> lineList, List<RStatAssesDPO> list1, List<PQSComAssesPO> list2, List<RStatLimitRateDPO> list3) {
         AssessDetailVo comAssess = new AssessDetailVo();
         comAssess.setDeptId(deptId);
         comAssess.setDeptName(deptName);
@@ -946,12 +946,61 @@ public class GridServiceImpl implements IGridService {
                 //计算总稳态合格率
                 double all1 = 100 - (devTime + freqTime + thdTime + ubalanceTime) * 100.0 / (allTime * 4);
                 double all2 = 100 - pltTime * 100.0 / allFlickerTime;
-                comAssess.setQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, (all1 + all2) / 2.0));
-                comAssess.setVDevQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - devTime * 100.0 / allTime));
-                comAssess.setFreqQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - freqTime * 100.0 / allTime));
-                comAssess.setHarmQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - thdTime * 100.0 / allTime));
-                comAssess.setFlickerQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - pltTime * 100.0 / allFlickerTime));
-                comAssess.setUnbalanceQualifyData(allTime <= 0 ? 3.14159 : PubUtils.doubleRound(2, 100 - ubalanceTime * 100.0 / allTime));
+
+                double data1,data2,data3,data4,data5,data6;
+                if (Double.isNaN(all1+all2)) {
+                    data1 = 3.14159;
+                } else if (Double.isInfinite(all1+all2)) {
+                    data1 = 100.0;
+                } else {
+                    data1 = PubUtils.doubleRound(2, (all1 + all2) / 2.0);
+                }
+
+                if (Double.isNaN(100 - devTime * 100.0 / allTime)) {
+                    data2 = 3.14159;
+                } else if (Double.isInfinite(100 - devTime * 100.0 / allTime)) {
+                    data2 = 100.0;
+                } else {
+                    data2 = PubUtils.doubleRound(2, 100 - devTime * 100.0 / allTime);
+                }
+
+                if (Double.isNaN(100 - freqTime * 100.0 / allTime)) {
+                    data3 = 3.14159;
+                } else if (Double.isInfinite(100 - freqTime * 100.0 / allTime)) {
+                    data3 = 100.0;
+                } else {
+                    data3 = PubUtils.doubleRound(2, 100 - freqTime * 100.0 / allTime);
+                }
+
+                if (Double.isNaN(100 - thdTime * 100.0 / allTime)) {
+                    data4 = 3.14159;
+                } else if (Double.isInfinite(100 - thdTime * 100.0 / allTime)) {
+                    data4 = 100.0;
+                } else {
+                    data4 = PubUtils.doubleRound(2, 100 - thdTime * 100.0 / allTime);
+                }
+
+                if (Double.isNaN(100 - pltTime * 100.0 / allFlickerTime)) {
+                    data5 = 3.14159;
+                } else if (Double.isInfinite(100 - pltTime * 100.0 / allFlickerTime)) {
+                    data5 = 100.0;
+                } else {
+                    data5 = PubUtils.doubleRound(2, 100 - pltTime * 100.0 / allFlickerTime);
+                }
+
+                if (Double.isNaN(100 - pltTime * 100.0 / allTime)) {
+                    data6 = 3.14159;
+                } else if (Double.isInfinite(100 - pltTime * 100.0 / allTime)) {
+                    data6 = 100.0;
+                } else {
+                    data6 = PubUtils.doubleRound(2, 100 - ubalanceTime * 100.0 / allTime);
+                }
+                comAssess.setQualifyData(allTime <= 0 ? 3.14159 : data1);
+                comAssess.setVDevQualifyData(allTime <= 0 ? 3.14159 : data2);
+                comAssess.setFreqQualifyData(allTime <= 0 ? 3.14159 : data3);
+                comAssess.setHarmQualifyData(allTime <= 0 ? 3.14159 : data4);
+                comAssess.setFlickerQualifyData(allTime <= 0 ? 3.14159 : data5);
+                comAssess.setUnbalanceQualifyData(allTime <= 0 ? 3.14159 : data6);
             }
         }
         return comAssess;