diff --git a/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java b/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java index ac82d90..2ed9e79 100644 --- a/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java +++ b/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java @@ -14,6 +14,7 @@ public class CommonQueryParam { private String lineId; private String tableName; private String columnName; + private String resultName; private String phasic; private String startTime; private String endTime; diff --git a/src/main/java/com/njcn/influx/service/CommonService.java b/src/main/java/com/njcn/influx/service/CommonService.java index 5de7e61..36c6146 100644 --- a/src/main/java/com/njcn/influx/service/CommonService.java +++ b/src/main/java/com/njcn/influx/service/CommonService.java @@ -84,5 +84,11 @@ public interface CommonService { */ StatisticalDataDTO getCounts(String lineId, String tableName, String columnName,String resultName, String phasic, String dataType, String clDid, String process,String startTime, String endTime); + /** + * 获取治理各个模块在规定时间内是否存在数据 + * @return + */ + StatisticalDataDTO getModuleCounts(String lineId, String tableName, String columnName,String resultName,String startTime, String endTime, String clDid); + List getEachModule(CommonQueryParam param); } 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 f353cd2..90ab210 100644 --- a/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java @@ -161,5 +161,27 @@ public class CommonServiceImpl implements CommonService { return commonMapper.getLineRtData(influxQueryWrapper); } + @Override + public StatisticalDataDTO getModuleCounts(String lineId, String tableName, String columnName, String resultName, String startTime, String endTime, String clDid) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class); + influxQueryWrapper.count(columnName,resultName) + .eq(InfluxDBTableConstant.LINE_ID,lineId) + .eq(InfluxDBTableConstant.CL_DID,clDid) + .between(InfluxDBTableConstant.TIME, startTime, endTime); + return commonMapper.getLineRtData(influxQueryWrapper); + } + @Override + public List getEachModule(CommonQueryParam param) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(param.getTableName(),StatisticalDataDTO.class); + influxQueryWrapper.select(param.getColumnName(),param.getResultName()) + .between(InfluxDBTableConstant.TIME, param.getStartTime(), param.getEndTime()) + .eq(InfluxDBTableConstant.LINE_ID,param.getLineId()) + .eq(InfluxDBTableConstant.PHASIC_TYPE, "M") + .eq(InfluxDBTableConstant.VALUE_TYPE,"avg") + .eq(param.getDataType(),0) + .eq(InfluxDBTableConstant.PROCESS,param.getProcess()) + .eq(InfluxDBTableConstant.CL_DID,param.getClDid()); + return commonMapper.getDeviceRtDataByTime(influxQueryWrapper); + } }