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 @@ com.njcn pqs-influx - 0.0.1-SNAPSHOT + ${project.version} com.squareup.okhttp3 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 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); }