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 a6694e7..dc00039 100644 --- a/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java @@ -74,12 +74,14 @@ public class CommonServiceImpl implements CommonService { .select(commonQueryParam.getColumnName(), InfluxDBTableConstant.VALUE) .eq(InfluxDBTableConstant.LINE_ID, commonQueryParam.getLineId()) .eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic()) - .eq(InfluxDBTableConstant.PROCESS, commonQueryParam.getProcess()) .between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime()) .eq(InfluxDBTableConstant.CL_DID, commonQueryParam.getClDid()); if (commonQueryParam.getDataType() != null) { influxQueryWrapper.eq(InfluxDBTableConstant.VALUE_TYPE, commonQueryParam.getDataType()); } + if (commonQueryParam.getProcess() != null) { + influxQueryWrapper.eq(InfluxDBTableConstant.PROCESS, commonQueryParam.getProcess()); + } List deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper); resultList.addAll(deviceRtData); }