From f6e6e94826ac8f8eaa33367f2a359115bee192c9 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 25 May 2023 14:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../harmonic/service/impl/CustomReportServiceImpl.java   | 9 +++++++++
 .../com/njcn/influx/service/HaronicRatioService.java     | 1 -
 .../influx/service/impl/HaronicRatioServiceImpl.java     | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index abc502fed..c987492b2 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -534,6 +534,15 @@ public class CustomReportServiceImpl implements CustomReportService {
                     .append(data.getStatMethod())
                     .append(InfluxDBSqlConstant.QM);
         }
+
+        //频率和频率偏差仅统计T相
+        if(data.getTemplateName().equals("freq_dev") || data.getTemplateName().equals("freq")){
+            sql.append(InfluxDBSqlConstant.AND)
+                    .append(InfluxDBTableConstant.PHASIC_TYPE)
+                    .append(InfluxDBSqlConstant.EQ)
+                    .append(InfluxDBTableConstant.PHASE_TYPE_T);
+        }
+
         //时间范围处理
         sql
                 .append(InfluxDBSqlConstant.AND)
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/HaronicRatioService.java b/pqs-influx/src/main/java/com/njcn/influx/service/HaronicRatioService.java
index 0c9880b78..2c7c7d809 100644
--- a/pqs-influx/src/main/java/com/njcn/influx/service/HaronicRatioService.java
+++ b/pqs-influx/src/main/java/com/njcn/influx/service/HaronicRatioService.java
@@ -1,7 +1,6 @@
 package com.njcn.influx.service;
 
 import com.njcn.influx.pojo.po.HarmonicRatioData;
-import com.njcn.influx.pojo.po.PowerQualityData;
 
 import java.util.List;
 
diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/HaronicRatioServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/HaronicRatioServiceImpl.java
index 7c031cba9..93f34b8a3 100644
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/HaronicRatioServiceImpl.java
+++ b/pqs-influx/src/main/java/com/njcn/influx/service/impl/HaronicRatioServiceImpl.java
@@ -2,7 +2,6 @@ package com.njcn.influx.service.impl;
 
 import com.njcn.influx.imapper.HaronicRatioMapper;
 import com.njcn.influx.pojo.po.HarmonicRatioData;
-import com.njcn.influx.pojo.po.PowerQualityData;
 import com.njcn.influx.query.InfluxQueryWrapper;
 import com.njcn.influx.service.HaronicRatioService;
 import lombok.RequiredArgsConstructor;