| @@ -415,13 +415,16 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| } | } | ||||
| if (lastMonthPower.getUsedPower() !=null && currentPower.getUsedPower() != null) { | 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 { | } else { | ||||
| resultMap.put("usedPowerRate", "--" + "%"); | resultMap.put("usedPowerRate", "--" + "%"); | ||||
| } | } | ||||
| KwMeter kwMeter = new KwMeter(); | KwMeter kwMeter = new KwMeter(); | ||||
| kwMeter.setTenantId(tenantId); | kwMeter.setTenantId(tenantId); | ||||
| kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); | kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); | ||||