From aab48d6b54c78c86a6b30747976325e5b34d5ab7 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 18 Jul 2019 10:55:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][chart55=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxChartServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 36ebf44ea..00b5123af 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -415,13 +415,16 @@ public class WxChartServiceImpl implements WxChartDataService { } if (lastMonthPower.getUsedPower() !=null && currentPower.getUsedPower() != null) { - double hbd = (double) (currentPower.getUsedPower() - lastMonthPower.getUsedPower()) / lastMonthPower.getUsedPower() * 100; - double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - resultMap.put("usedPowerRate", hb + "%"); + if(lastMonthPower.getUsedPower().equals(0)){ + resultMap.put("usedPowerRate", "0%"); + }else{ + double hbd = (double) (currentPower.getUsedPower() - lastMonthPower.getUsedPower()) / lastMonthPower.getUsedPower() * 100; + double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + resultMap.put("usedPowerRate", hb + "%"); + } } else { resultMap.put("usedPowerRate", "--" + "%"); } - KwMeter kwMeter = new KwMeter(); kwMeter.setTenantId(tenantId); kwMeter.setStatus(EnumMeterStatus.VALID.getCode());