From 2be6a85bedf2e739e0ca72c2c5537c56f938d551 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Tue, 7 Nov 2023 14:26:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java | 3 +++
 cs-device/cs-device-boot/pom.xml                              | 2 +-
 .../com/njcn/csdevice/service/impl/CsGroupServiceImpl.java    | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java
index fdd467e..4da96f4 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java
@@ -53,4 +53,7 @@ public class EnergyTemplateVO {
     @ApiModelProperty("最小值")
     private Double minValue;
 
+    @ApiModelProperty("平均值")
+    private Double avgValue;
+
 }
diff --git a/cs-device/cs-device-boot/pom.xml b/cs-device/cs-device-boot/pom.xml
index 110ca75..e471dfd 100644
--- a/cs-device/cs-device-boot/pom.xml
+++ b/cs-device/cs-device-boot/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.njcn</groupId>
       <artifactId>pqs-influx</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index cac2bb2..9c1253e 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -170,9 +170,13 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 if (!Objects.isNull(statisticalDataDTO)){
                     vo.setMaxValue(BigDecimal.valueOf(statisticalDataDTO.getMaxValue()).setScale(4, RoundingMode.UP).doubleValue());
                     vo.setMinValue(BigDecimal.valueOf(statisticalDataDTO.getMinValue()).setScale(4, RoundingMode.UP).doubleValue());
+                    vo.setMinValue(BigDecimal.valueOf(statisticalDataDTO.getAvgValue()).setScale(4, RoundingMode.UP).doubleValue());
+
                 } else {
                     vo.setMaxValue(3.1415956);
                     vo.setMinValue(3.1415956);
+                    vo.setAvgValue(3.1415956);
+
                 }
                 arrayList.add(vo);
             }