From 6af6232b5175a0348455fe100245114ce7938bf8 Mon Sep 17 00:00:00 2001 From: zq Date: Mon, 15 Dec 2025 15:32:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=9F=E4=BA=A7=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=8E=A5=E5=8F=A3=E7=A9=BA=E6=8C=87=E9=92=88=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/service/impl/EmsStatsReportServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java index cf6b466..3393ada 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java @@ -65,9 +65,13 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService // 总充总放 String nowData = DateUtils.getDate(); + BigDecimal totalDischarge = BigDecimal.ZERO; + BigDecimal totalCharge = BigDecimal.ZERO; Map totalMap = emsDailyChargeDataMapper.getAllSiteChargeData(nowData,requestVo.getSiteId()); - BigDecimal totalDischarge = totalMap.get("totalDischargedCap") != null ? totalMap.get("totalDischargedCap") : BigDecimal.ZERO; - BigDecimal totalCharge = totalMap.get("totalChargedCap") != null ? totalMap.get("totalChargedCap") : BigDecimal.ZERO; + if (!CollectionUtils.isEmpty(totalMap)) { + totalDischarge = totalMap.get("totalDischargedCap"); + totalCharge = totalMap.get("totalChargedCap"); + } BigDecimal efficiency = new BigDecimal(0); if ( totalCharge.compareTo(BigDecimal.ZERO)>0){ efficiency = totalDischarge.divide(totalCharge, 2, RoundingMode.HALF_UP) @@ -265,7 +269,7 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService public List getAmmeterDataResult(StatisAmmeterDateRequest requestVo){ List dataList = emsDailyEnergyDataMapper.getDataBySiteId(requestVo.getSiteId(),requestVo.getStartTime(),requestVo.getEndTime()); if (dataList == null || dataList.size()==0){ - return null; + return new ArrayList<>(); } BigDecimal activePower = new BigDecimal(0);