diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java index 2577cf3..71cd5de 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java @@ -249,9 +249,11 @@ public class DataServiceImpl implements IDataService { } vo.setAvgValue(Double.valueOf(df.format(re))); }else { - re = statisticalDataDTO.getValue(); + if (Objects.nonNull(statisticalDataDTO)) { + re = statisticalDataDTO.getValue(); + vo.setAvgValue(Double.valueOf(df.format(re))); + } unit = item2.getUnit(); - vo.setAvgValue(Double.valueOf(df.format(re))); } } } else { @@ -273,8 +275,10 @@ public class DataServiceImpl implements IDataService { } vo.setAvgValue(Double.valueOf(df.format(re))); }else { - re = statisticalDataDTO.getValue(); - vo.setAvgValue(Double.valueOf(df.format(re))); + if (Objects.nonNull(statisticalDataDTO)) { + re = statisticalDataDTO.getValue(); + vo.setAvgValue(Double.valueOf(df.format(re))); + } } } else { vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));