|
|
|
@ -380,6 +380,9 @@ public class ProOverviewServiceImpl implements IProOverviewService { |
|
|
|
|
|
|
|
|
|
|
|
// 查询日表,求出匹配accumulatedHeat集合
|
|
|
|
// 查询日表,求出匹配accumulatedHeat集合
|
|
|
|
BigDecimal hourData = overviewMapper.queryHourData(accumulatedHeat, "data_hour"+DateUtils.getDate().substring(0, 4), DateUtils.getDate()); |
|
|
|
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("instantaneousHeatSum", instantaneousHeatSum); |
|
|
|
result.put("accumulatedHeatSum", accumulatedHeatSum); |
|
|
|
result.put("accumulatedHeatSum", accumulatedHeatSum); |
|
|
|
@ -427,6 +430,9 @@ public class ProOverviewServiceImpl implements IProOverviewService { |
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
|
|
|
|
|
|
|
|
|
BigDecimal hourData = overviewMapper.queryHourData(accumulatedHeat, "data_hour"+DateUtils.getDate().substring(0, 4), DateUtils.getDate()); |
|
|
|
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("instantaneousHeatSum", instantaneousHeatSum); |
|
|
|
result.put("accumulatedHeatSum", accumulatedHeatSum); |
|
|
|
result.put("accumulatedHeatSum", accumulatedHeatSum); |
|
|
|
|