From 889ca191e5604f811977392d063e80bb9d072aba Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 4 Aug 2023 14:58:17 +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

---
 .../service/impl/CommonServiceImpl.java       | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
index 820c13222..13f5963b3 100644
--- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
+++ b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
@@ -29,22 +29,13 @@ public class CommonServiceImpl implements CommonService {
     @Override
     public StatisticalDataDTO getLineRtData(String lineId, String tableName, String columnName, String phasic, String dataType) {
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class);
-        if (Objects.equals(dataType,"M")){
-            influxQueryWrapper.select(StatisticalDataDTO::getLineId)
-                    .select(StatisticalDataDTO::getPhaseType)
-                    .select(StatisticalDataDTO::getValueType)
-                    .last(columnName)
-                    .eq(InfluxDBTableConstant.LINE_ID,lineId)
-                    .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic);
-        } else {
-            influxQueryWrapper.select(StatisticalDataDTO::getLineId)
-                    .select(StatisticalDataDTO::getPhaseType)
-                    .select(StatisticalDataDTO::getValueType)
-                    .last(columnName)
-                    .eq(InfluxDBTableConstant.LINE_ID,lineId)
-                    .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic)
-                    .eq(InfluxDBTableConstant.VALUE_TYPE,dataType);
-        }
+        influxQueryWrapper.select(StatisticalDataDTO::getLineId)
+                .select(StatisticalDataDTO::getPhaseType)
+                .select(StatisticalDataDTO::getValueType)
+                .last(columnName)
+                .eq(InfluxDBTableConstant.LINE_ID,lineId)
+                .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic)
+                .eq(InfluxDBTableConstant.VALUE_TYPE,dataType);
         return commonMapper.getLineRtData(influxQueryWrapper);
     }