From 3b25a9e235c23b00c35ce29b003993f02961a2db Mon Sep 17 00:00:00 2001 From: 25604 Date: Wed, 4 Feb 2026 17:40:11 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A6=96=E9=A1=B5=E7=83=AD=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E6=95=B0=E6=8D=AE=E6=97=A5=E7=B4=AF=E7=A7=AF=E5=80=BC?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/overview/impl/ProOverviewServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java index 2fd796f..331422a 100644 --- a/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java @@ -380,6 +380,9 @@ public class ProOverviewServiceImpl implements IProOverviewService { // 查询日表，求出匹配accumulatedHeat集合 BigDecimal hourData = overviewMapper.queryHourData(accumulatedHeat, "data_hour"+DateUtils.getDate().substring(0, 4), DateUtils.getDate()); + if (hourData == null) { + hourData = BigDecimal.ZERO; + } result.put("instantaneousHeatSum", instantaneousHeatSum); result.put("accumulatedHeatSum", accumulatedHeatSum); @@ -427,6 +430,9 @@ public class ProOverviewServiceImpl implements IProOverviewService { .reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal hourData = overviewMapper.queryHourData(accumulatedHeat, "data_hour"+DateUtils.getDate().substring(0, 4), DateUtils.getDate()); + if (hourData == null) { + hourData = BigDecimal.ZERO; + } result.put("instantaneousHeatSum", instantaneousHeatSum); result.put("accumulatedHeatSum", accumulatedHeatSum);