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 59d6ede..ac82d90 100644 --- a/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java +++ b/src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java @@ -20,5 +20,5 @@ public class CommonQueryParam { private String dataType; private String process; private String clDid; - + private String frequency; } diff --git a/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java b/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java index 066ae65..2abacd4 100644 --- a/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java +++ b/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java @@ -36,6 +36,10 @@ public class StatisticalDataDTO { private String clDid; + /** + * 谐波次数 + */ + private String frequency; /** * 指标值 */ 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 72f2621..93e2106 100644 --- a/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java @@ -108,6 +108,9 @@ public class CommonServiceImpl implements CommonService { influxQueryWrapper.eq(InfluxDBTableConstant.CL_DID, commonQueryParam.getClDid()); } List deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper); + for(StatisticalDataDTO statisticalDataDTO : deviceRtData){ + statisticalDataDTO.setFrequency(commonQueryParam.getFrequency()); + } resultList.addAll(deviceRtData); }