From 217afe5e0130d35f7a56e37e451dc943418de3cf Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 4 Sep 2023 09:03:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E8=B6=85=E9=AB=98=E5=8E=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/service/impl/LineIntegrityDataServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java index 6b01e31ab..4c4f7cf48 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java @@ -202,11 +202,13 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime()); - outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue()); + double v = integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159); + outParam.setSingle(v!=3.14159?NumberUtil.round(v,2).doubleValue():v); //如果存在需要比较的时间,再获取对应数据 if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) { List compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime()); - outParam.setRatio(NumberUtil.round(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue()); + double v1 = compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159); + outParam.setRatio(v1!=3.14159?NumberUtil.round(v1,2).doubleValue():v1); } out.add(outParam); }