This commit is contained in:
xy
2024-12-27 11:01:48 +08:00
parent b377ad7c95
commit 04cdb50b13

View File

@@ -249,10 +249,12 @@ public class DataServiceImpl implements IDataService {
} }
vo.setAvgValue(Double.valueOf(df.format(re))); vo.setAvgValue(Double.valueOf(df.format(re)));
}else { }else {
if (Objects.nonNull(statisticalDataDTO)) {
re = statisticalDataDTO.getValue(); re = statisticalDataDTO.getValue();
unit = item2.getUnit();
vo.setAvgValue(Double.valueOf(df.format(re))); vo.setAvgValue(Double.valueOf(df.format(re)));
} }
unit = item2.getUnit();
}
} }
} else { } else {
if (Objects.equals("Primary",csDataSetLevel)) { if (Objects.equals("Primary",csDataSetLevel)) {
@@ -273,9 +275,11 @@ public class DataServiceImpl implements IDataService {
} }
vo.setAvgValue(Double.valueOf(df.format(re))); vo.setAvgValue(Double.valueOf(df.format(re)));
}else { }else {
if (Objects.nonNull(statisticalDataDTO)) {
re = statisticalDataDTO.getValue(); re = statisticalDataDTO.getValue();
vo.setAvgValue(Double.valueOf(df.format(re))); vo.setAvgValue(Double.valueOf(df.format(re)));
} }
}
} else { } else {
vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue()))); vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));
} }