Middleware/pqs-influx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

上一个版本恢复不需要添加对应的方法了,直接更改通用查询方法

Browse Source
This commit is contained in:
guofeihu
2024-09-03 14:05:11 +08:00
parent d298f2b9fd
commit 067f49cda7
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/njcn/influx/service/DataHarmPowerPService.java
View File

@@ -13,5 +13,4 @@ import java.util.List;
public interface DataHarmPowerPService { public interface DataHarmPowerPService {
List<DataHarmPowerP> getHarmonicPowerP(String lineIndex, String startTime, String endTime); List<DataHarmPowerP> getHarmonicPowerP(String lineIndex, String startTime, String endTime);
List<DataHarmPowerP> getNewHarmonicPowerP(String lineIndex, String startTime, String endTime, String phaseType, String valueType);
} }

5
src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java
View File

@@ -89,9 +89,12 @@ public class CommonServiceImpl implements CommonService {
.select(StatisticalDataDTO::getPhaseType) .select(StatisticalDataDTO::getPhaseType)
.select(StatisticalDataDTO::getValueType) .select(StatisticalDataDTO::getValueType)
.select(commonQueryParam.getColumnName(), InfluxDBTableConstant.VALUE) .select(commonQueryParam.getColumnName(), InfluxDBTableConstant.VALUE)
.eq(InfluxDBTableConstant.LINE_ID, commonQueryParam.getLineId()) //查询条件开始和结束时间是必须的
.between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime()); .between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime());
//此方法和getDeviceRtDataByTime方法逻辑一致,只是在以下条件判断中允许部分查询参数为空,也即可以不带入查询 //此方法和getDeviceRtDataByTime方法逻辑一致,只是在以下条件判断中允许部分查询参数为空,也即可以不带入查询
if(commonQueryParam.getLineId() != null) {
influxQueryWrapper.eq(InfluxDBTableConstant.LINE_ID, commonQueryParam.getLineId());
}
if(commonQueryParam.getPhasic() != null) { if(commonQueryParam.getPhasic() != null) {
influxQueryWrapper.eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic()); influxQueryWrapper.eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic());
} }

10
src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java
View File

@@ -30,14 +30,4 @@ public class DataHarmPowerPServiceImpl implements DataHarmPowerPService {
return result1; 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;
}
} }