From ad5833f48aa581e2597234479628075c2f8d4a12 Mon Sep 17 00:00:00 2001 From: guofeihu <3347277866@qq.com> Date: Fri, 13 Sep 2024 14:28:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9F=A5=E8=AF=A2=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=96=B0=E5=A2=9E=E8=B0=90=E6=B3=A2=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java | 2 +- .../java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java | 4 ++++ .../java/com/njcn/influx/service/impl/CommonServiceImpl.java | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) 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); }