微调
This commit is contained in:
@@ -29,22 +29,13 @@ public class CommonServiceImpl implements CommonService {
|
|||||||
@Override
|
@Override
|
||||||
public StatisticalDataDTO getLineRtData(String lineId, String tableName, String columnName, String phasic, String dataType) {
|
public StatisticalDataDTO getLineRtData(String lineId, String tableName, String columnName, String phasic, String dataType) {
|
||||||
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class);
|
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class);
|
||||||
if (Objects.equals(dataType,"M")){
|
influxQueryWrapper.select(StatisticalDataDTO::getLineId)
|
||||||
influxQueryWrapper.select(StatisticalDataDTO::getLineId)
|
.select(StatisticalDataDTO::getPhaseType)
|
||||||
.select(StatisticalDataDTO::getPhaseType)
|
.select(StatisticalDataDTO::getValueType)
|
||||||
.select(StatisticalDataDTO::getValueType)
|
.last(columnName)
|
||||||
.last(columnName)
|
.eq(InfluxDBTableConstant.LINE_ID,lineId)
|
||||||
.eq(InfluxDBTableConstant.LINE_ID,lineId)
|
.eq(InfluxDBTableConstant.PHASIC_TYPE,phasic)
|
||||||
.eq(InfluxDBTableConstant.PHASIC_TYPE,phasic);
|
.eq(InfluxDBTableConstant.VALUE_TYPE,dataType);
|
||||||
} 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);
|
|
||||||
}
|
|
||||||
return commonMapper.getLineRtData(influxQueryWrapper);
|
return commonMapper.getLineRtData(influxQueryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user