From 01edcba6e28876f5598b39e2f6ee0c40870ac4de Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Tue, 7 Nov 2023 14:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/influx/pojo/constant/InfluxDBTableConstant.java | 5 +++++
 .../java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java    | 5 +++++
 .../java/com/njcn/influx/service/impl/CommonServiceImpl.java | 1 +
 3 files changed, 11 insertions(+)

diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java
index 7a015fb3d..5275833b8 100644
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java
+++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java
@@ -120,6 +120,11 @@ public interface InfluxDBTableConstant {
      */
     String MIN_VALUE = "minValue";
 
+    /**
+     * 统计结果平均值
+     */
+    String AVG_VALUE = "avgValue";
+
     /**
      * 数据质量标志
      */
diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java
index 3ff181244..9dd5f6195 100644
--- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java
+++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java
@@ -61,5 +61,10 @@ public class StatisticalDataDTO {
      */
     private Double minValue;
 
+    /**
+     * 指标平均值
+     */
+    private Double avgValue;
+
 
 }
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 ea9088ecf..3cc840cc9 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
@@ -96,6 +96,7 @@ public class CommonServiceImpl implements CommonService {
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(getTableNameByClassId(tableName),StatisticalDataDTO.class);
         influxQueryWrapper.max(columnName,InfluxDBTableConstant.MAX_VALUE)
                 .min(columnName,InfluxDBTableConstant.MIN_VALUE)
+                .mean(columnName)
                 .eq(InfluxDBTableConstant.LINE_ID,lineId)
                 .eq(InfluxDBTableConstant.CL_DID,clDid)
                 .between(InfluxDBTableConstant.TIME, startTime, endTime);