diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java b/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java index 3efc5f720..9fa4ee660 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/CommonService.java @@ -23,7 +23,7 @@ public interface CommonService { * @param dataType 数据类型 * @return */ - StatisticalDataDTO getLineRtData(String lineId, String tableName, String columnName, String phasic, String dataType); + StatisticalDataDTO getLineRtData(String lineId, String tableName, String columnName, String phasic, String dataType, String clDId); /** * 根据条件获取监测点数据 @@ -58,7 +58,7 @@ public interface CommonService { * @param tableName 表名 * @param columnName 字段名 */ - StatisticalDataDTO getLineHistoryData(String lineId, String tableName, String columnName, String startTime, String endTime); + StatisticalDataDTO getLineHistoryData(String lineId, String tableName, String columnName, String startTime, String endTime, String clDId); /*** * 当表名、字段、统计方式均不确定时,代码拼接好sql diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java index 7815fdcd1..1923d5a57 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java @@ -32,7 +32,7 @@ public class CommonServiceImpl implements CommonService { private final DicDataFeignClient dicDataFeignClient; @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, String clDid) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(getTableNameByClassId(tableName),StatisticalDataDTO.class); influxQueryWrapper.select(StatisticalDataDTO::getLineId) .select(StatisticalDataDTO::getPhaseType) @@ -40,7 +40,8 @@ public class CommonServiceImpl implements CommonService { .last(columnName) .eq(InfluxDBTableConstant.LINE_ID,lineId) .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic) - .eq(InfluxDBTableConstant.VALUE_TYPE,dataType); + .eq(InfluxDBTableConstant.VALUE_TYPE,dataType) + .eq(InfluxDBTableConstant.CL_DID,clDid); return commonMapper.getLineRtData(influxQueryWrapper); } @@ -72,11 +73,12 @@ public class CommonServiceImpl implements CommonService { } @Override - public StatisticalDataDTO getLineHistoryData(String lineId, String tableName, String columnName, String startTime, String endTime) { + public StatisticalDataDTO getLineHistoryData(String lineId, String tableName, String columnName, String startTime, String endTime, String clDid) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(getTableNameByClassId(tableName),StatisticalDataDTO.class); influxQueryWrapper.max(columnName,InfluxDBTableConstant.MAX_VALUE) .min(columnName,InfluxDBTableConstant.MIN_VALUE) .eq(InfluxDBTableConstant.LINE_ID,lineId) + .eq(InfluxDBTableConstant.CL_DID,clDid) .between(InfluxDBTableConstant.TIME, startTime, endTime); return commonMapper.getLineHistoryData(influxQueryWrapper); }