diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java index ab3e1621e..1d0798b44 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java @@ -239,6 +239,11 @@ public class indexController extends BaseController { String totalChargingAmount = situation.getTotalChargingAmount(); String totalChargingDegree = situation.getTotalChargingDegree(); Long totalPileCount = totalPilesFuture.get(); + // 直流充电桩数量 + Long dcPileNums = dcPilesFuture.get(); + // 交流充电桩数量 + Long acPileNums = acPilesFuture.get(); + // 总订单数从settle_order_report的GROUP BY结果中获取(charge_num汇总) String totalOrderCountStr = situation.getTotalChargingQuantity(); Long totalOrderCount = (totalOrderCountStr != null && !totalOrderCountStr.isEmpty()) @@ -251,6 +256,8 @@ public class indexController extends BaseController { totalChargingDegree = new BigDecimal(totalChargingDegree).multiply(multiplier).toString(); totalPileCount = totalPileCount != null ? totalPileCount * 3 : 0L; totalOrderCount = totalOrderCount * 3; + dcPileNums = dcPileNums * 3; + acPileNums = acPileNums * 3; } overviewVO.setTotalUsers(totalUsersFuture.get()); @@ -268,8 +275,8 @@ public class indexController extends BaseController { overviewVO.setMonthlyAvgElectricity(monthlyAvg != null ? monthlyAvg.toPlainString() : "0"); overviewVO.setTotalGuns(totalGunsFuture.get()); overviewVO.setOnlinePiles(onlinePilesFuture.get()); - overviewVO.setOnlineStations(dcPilesFuture.get()); - overviewVO.setOnlineGuns(acPilesFuture.get()); + overviewVO.setOnlineStations(dcPileNums); + overviewVO.setOnlineGuns(acPileNums); // 节能减排计算 BigDecimal totalElecKwh = new BigDecimal(totalChargingDegree);