From 82fa9cd90a845cd167dfbacbb06e3f65a69c60b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 7 Sep 2023 10:33:49 +0800 Subject: [PATCH] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/harmonic/service/impl/IntegrityServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java index 1769ed3ff..d74c414b6 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java @@ -177,17 +177,15 @@ public class IntegrityServiceImpl implements IntegrityService { if (CollectionUtils.isEmpty(lineIndexes)) { continue; } -// type.add(generalDeviceDTO.getName()); outParam.setType(generalDeviceDTO.getName()); //根据监测点查询数据完整性 List integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime()); -// single.add(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159)); - outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159),2).doubleValue()); + outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue()); //如果存在需要比较的时间，再获取对应数据 if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) { List compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime()); -// ratio.add(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159)); - outParam.setRatio(NumberUtil.round(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159),2).doubleValue()); + double tem = compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159); + outParam.setRatio(tem == 3.14159 ? tem : NumberUtil.round(tem, 2).doubleValue()); } out.add(outParam); }