From dc99e8a28673af16796bdd434d7f47b434b6a4d6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 27 三月 2026 18:18:42 +0800
Subject: [PATCH] 决策分析---能耗单耗
---
src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
index 60bbcd3..58dc509 100644
--- a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
+++ b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
@@ -143,9 +143,6 @@
energyStatisticsVo.setType(null);//鎭㈠鏌ヨ鍏ㄩ儴
//骞冲潎鎴愭湰
energyAccountDto.setAverageEnergyCost(energyAccountDto.getTotalEnergyCost().divide(new BigDecimal(energyStatisticsVo.getDays()),2, RoundingMode.HALF_UP));
- //鑳借�楁垚鏈秼鍔�
- List<EnergyAccountTypeDto> energyAccountTypeDtos=energyConsumptionDetailMapper.energyAccountTypeDtos(energyStatisticsVo);
- energyAccountDto.setEnergyAccountTypeDtos(energyAccountTypeDtos);
//鑳借�楃被鍨嬫垚鏈崰姣�
List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
energyAccountDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
@@ -154,4 +151,14 @@
energyAccountDto.setEnergyConsumptionDetailDtoList(energyConsumptionDetailDtoList);
return energyAccountDto;
}
+
+ @Override
+ public EnergyCollectDto collectEnergy(EnergyStatisticsVo energyStatisticsVo) {
+ EnergyCollectDto energyCollectDto = new EnergyCollectDto();
+ //鑳借�楀崟鑰楁暟鎹�
+ List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
+ energyCollectDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
+ //鑳借�楀崟鑰楄秼鍔�(寰呭疄鐜�)
+ return energyCollectDto;
+ }
}
--
Gitblit v1.9.3