fix(influx): 修复数据类型查询条件空指针异常
- 添加了数据类型参数的空值检查 - 避免在查询条件中传入null值导致的异常 - 确保查询构建器只在参数非空时添加数据类型过滤条件
This commit is contained in:
@@ -76,7 +76,10 @@ public class CommonServiceImpl implements CommonService {
|
|||||||
.eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic())
|
.eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic())
|
||||||
.eq(InfluxDBTableConstant.PROCESS, commonQueryParam.getProcess())
|
.eq(InfluxDBTableConstant.PROCESS, commonQueryParam.getProcess())
|
||||||
.between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime())
|
.between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime())
|
||||||
.eq(InfluxDBTableConstant.VALUE_TYPE, commonQueryParam.getDataType()).eq(InfluxDBTableConstant.CL_DID, commonQueryParam.getClDid());
|
.eq(InfluxDBTableConstant.CL_DID, commonQueryParam.getClDid());
|
||||||
|
if (commonQueryParam.getDataType() != null) {
|
||||||
|
influxQueryWrapper.eq(InfluxDBTableConstant.VALUE_TYPE, commonQueryParam.getDataType());
|
||||||
|
}
|
||||||
List<StatisticalDataDTO> deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper);
|
List<StatisticalDataDTO> deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper);
|
||||||
resultList.addAll(deviceRtData);
|
resultList.addAll(deviceRtData);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user