diff --git a/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java b/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java
index 642b7d6..14074ea 100644
--- a/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java
+++ b/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java
@@ -13,5 +13,4 @@ import java.util.List;
 public interface DataHarmPowerPService {
     List<DataHarmPowerP> getHarmonicPowerP(String lineIndex, String startTime, String endTime);
 
-    List<DataHarmPowerP> getNewHarmonicPowerP(String lineIndex, String startTime, String endTime, String phaseType, String valueType);
 }
diff --git a/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
index 31f3fa5..72f2621 100644
--- a/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
+++ b/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
@@ -89,9 +89,12 @@ public class CommonServiceImpl implements CommonService {
                     .select(StatisticalDataDTO::getPhaseType)
                     .select(StatisticalDataDTO::getValueType)
                     .select(commonQueryParam.getColumnName(), InfluxDBTableConstant.VALUE)
-                    .eq(InfluxDBTableConstant.LINE_ID, commonQueryParam.getLineId())
+                    //查询条件开始和结束时间是必须的
                     .between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime());
                     //此方法和getDeviceRtDataByTime方法逻辑一致,只是在以下条件判断中允许部分查询参数为空,也即可以不带入查询
+                    if(commonQueryParam.getLineId() != null) {
+                        influxQueryWrapper.eq(InfluxDBTableConstant.LINE_ID, commonQueryParam.getLineId());
+                    }
                     if(commonQueryParam.getPhasic() != null) {
                         influxQueryWrapper.eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic());
                     }
diff --git a/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java
index 8540b51..c46456b 100644
--- a/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java
+++ b/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java
@@ -30,14 +30,4 @@ public class DataHarmPowerPServiceImpl implements DataHarmPowerPService {
         return result1;
     }
 
-    @Override
-    public List<DataHarmPowerP> getNewHarmonicPowerP(String lineIndex, String startTime, String endTime, String phaseType, String valueType) {
-        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPowerP.class);
-        influxQueryWrapper.between(DataHarmPowerP::getTime, startTime, endTime);
-        if(lineIndex != null) influxQueryWrapper.eq(DataHarmPowerP::getLineId, lineIndex);
-        if(phaseType != null) influxQueryWrapper.eq(DataHarmPowerP::getPhaseType, phaseType);
-        if(valueType != null) influxQueryWrapper.eq(DataHarmPowerP::getValueType, valueType);
-        List<DataHarmPowerP> result1 = dataHarmPowerPMapper.getStatisticsByWraper(influxQueryWrapper);
-        return result1;
-    }
 }