From f1d0e7df42414ac9cc798ff32df561c7216eedad Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Fri, 13 Dec 2024 14:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=B4=E8=B0=90=E6=B3=A2?=
 =?UTF-8?q?=E5=90=AB=E6=9C=89=E7=8E=8717=E8=87=B350=E6=AC=A1=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
index cc7d4db2e..b87df3352 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
@@ -643,9 +643,13 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     break;
                 case 46:
                     //间谐波电压含有率
-                    sql = "SELECT time as time, v_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_inharmrate_v WHERE " + stringBuilder +
+                    sql = "SELECT time as time, v_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_inharm_v WHERE " + stringBuilder +
                             " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
-                    topLimit = PubUtils.getValueByMethod(overlimit, "getInuharm", number);
+                    if(number<17){
+                        topLimit = PubUtils.getValueByMethod(overlimit, "getInuharm", number);
+                    }else {
+                        topLimit = 0.0f;
+                    }
                     if (ptType == 0) {
                         phasicType.add("A相");
                         phasicType.add("B相");
@@ -660,7 +664,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     break;
                 case 47:
                     //间谐波电流含有率
-                    sql = "SELECT time as time, i_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_inharmrate_i WHERE " + stringBuilder +
+                    sql = "SELECT time as time, i_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_inharm_i WHERE " + stringBuilder +
                             " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
                     phasicType.add("A相");
                     phasicType.add("B相");
@@ -1016,7 +1020,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
 
                 case 46:
                     //间谐波电压含有率
-                    sql = "SELECT time as time, v_" + number + " as aValue FROM data_inharmrate_v WHERE " + stringBuilder +
+                    sql = "SELECT time as time, v_" + number + " as aValue FROM data_inharm_v WHERE " + stringBuilder +
                             " order by time asc tz('Asia/Shanghai');";
                     topLimit = PubUtils.getValueByMethod(overlimit, "getInuharm", number);
                     unit.add("%");