From f4dbfb0f7142a41cc8dc1e7cca8bc7526b4a6643 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 07 二月 2025 19:52:28 +0800
Subject: [PATCH] 综合能耗分析 过滤统计点位
---
zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java
index ef04d02..bb47c3b 100644
--- a/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java
@@ -397,12 +397,12 @@
// if (CollectionUtils.isEmpty(nodeIndexInforList)) {
// return consumptionAnalysisVO;
// }
-
- final List<String> eneryIdList = nodeIndexInforList.stream().map(ModelNodeIndexInfor::getEnergyId).distinct().collect(Collectors.toList());
+ //淇敼杩囨护缁熻鐐逛綅
+ final List<String> eneryIdList = nodeIndexInforList.stream().filter(x->x.getIndexType().equals("STATISTIC")).map(ModelNodeIndexInfor::getEnergyId).distinct().collect(Collectors.toList());
final LambdaQueryWrapper<SysEnergy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CollectionUtils.isNotEmpty(eneryIdList),SysEnergy::getEnersno,eneryIdList);
final List<SysEnergy> sysEnergies = sysEnergyMapper.selectList(queryWrapper);
- final Map<String, Object> energyCoefficientMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno, SysEnergy::getCoefficient));
+ final Map<String, BigDecimal> energyCoefficientMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno, SysEnergy::getCoefficient));
final Map<String, String> energyNameMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno,SysEnergy::getEnername));
final Map<String, String> indexIdEnergyIdMap = new HashMap<>();
nodeIndexInforList.forEach(n->{
@@ -528,7 +528,7 @@
final String indexId = dataItem.getIndexId();
final String energyId = indexIdEnergyIdMap.get(indexId);
- final BigDecimal coefficient = (BigDecimal) energyCoefficientMap.get(energyId);
+ final BigDecimal coefficient = energyCoefficientMap.get(energyId);
if(coefficient == null){
throw new RuntimeException("鑳芥簮绫诲瀷" + energyId + "娌℃湁閰嶇疆鎶樻爣绯绘暟锛屾棤娉曡绠�");
}
@@ -549,7 +549,7 @@
final String indexId = dataItem.getIndexId();
final String energyId = indexIdEnergyIdMap.get(indexId);
- final BigDecimal coefficient = (BigDecimal) energyCoefficientMap.get(energyId);
+ final BigDecimal coefficient = energyCoefficientMap.get(energyId);
if(coefficient == null){
throw new RuntimeException("鑳芥簮绫诲瀷" + energyId + "娌℃湁閰嶇疆鎶樻爣绯绘暟锛屾棤娉曡绠�");
}
@@ -613,7 +613,7 @@
indexDataItemMap.forEach((indexId,value)->{
final String energyId = indexIdEnergyIdMap.get(indexId);
- final BigDecimal coefficient = (BigDecimal) energyCoefficientMap.get(energyId);
+ final BigDecimal coefficient = energyCoefficientMap.get(energyId);
if(coefficient == null){
throw new RuntimeException("鑳芥簮绫诲瀷" + energyId + "娌℃湁閰嶇疆鎶樻爣绯绘暟锛屾棤娉曡绠�");
}
@@ -722,7 +722,7 @@
final LambdaQueryWrapper<SysEnergy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CollectionUtils.isNotEmpty(eneryIdList),SysEnergy::getEnersno,eneryIdList);
final List<SysEnergy> sysEnergies = sysEnergyMapper.selectList(queryWrapper);
- final Map<String, Object> energyCoefficientMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno, SysEnergy::getCoefficient));
+ final Map<String, BigDecimal> energyCoefficientMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno, SysEnergy::getCoefficient));
final Map<String, String> indexIdEnergyIdMap = new HashMap<>();
nodeIndexInforList.forEach(n->{
final String indexId = n.getIndexId();
@@ -775,7 +775,7 @@
final String indexId = dataItem.getIndexId();
final String energyId = indexIdEnergyIdMap.get(indexId);
- final BigDecimal coefficient = (BigDecimal) energyCoefficientMap.get(energyId);
+ final BigDecimal coefficient = energyCoefficientMap.get(energyId);
if(coefficient == null){
throw new RuntimeException("鑳芥簮绫诲瀷" + energyId + "娌℃湁閰嶇疆鎶樻爣绯绘暟锛屾棤娉曡绠�");
}
@@ -811,7 +811,7 @@
indexDataItemMap.forEach((indexId,value)->{
final String energyId = indexIdEnergyIdMap.get(indexId);
- final BigDecimal coefficient = (BigDecimal) energyCoefficientMap.get(energyId);
+ final BigDecimal coefficient = energyCoefficientMap.get(energyId);
if(coefficient == null){
throw new RuntimeException("鑳芥簮绫诲瀷" + energyId + "娌℃湁閰嶇疆鎶樻爣绯绘暟锛屾棤娉曡绠�");
}
@@ -854,7 +854,7 @@
queryWrapper.in(CollectionUtils.isNotEmpty(eneryIdList),SysEnergy::getEnersno,eneryIdList);
final List<SysEnergy> sysEnergies = sysEnergyMapper.selectList(queryWrapper);
//鑳芥簮缂栧彿鍜岃兘婧愭姌鏍囩郴鏁�
- final Map<String, Object> energyCoefficientMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno, SysEnergy::getCoefficient));
+ final Map<String, BigDecimal> energyCoefficientMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno, SysEnergy::getCoefficient));
//index鍜岃兘婧�
final Map<String, String> indexIdEnergyIdMap = new HashMap<>();
nodeIndexInforList.forEach(n->{
@@ -899,7 +899,7 @@
indexIdList.forEach(indexId->{
final List<DataItem> dataItems = dataItemMap.get(indexId);
final String energyId = indexIdEnergyIdMap.get(indexId);
- final BigDecimal coefficient = (BigDecimal) energyCoefficientMap.get(energyId);
+ final BigDecimal coefficient = energyCoefficientMap.get(energyId);
if(CollectionUtils.isNotEmpty(dataItems) ){
BigDecimal sum = BigDecimal.valueOf(dataItems.stream()
@@ -999,7 +999,7 @@
final LambdaQueryWrapper<SysEnergy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CollectionUtils.isNotEmpty(eneryIdList),SysEnergy::getEnersno,eneryIdList);
final List<SysEnergy> sysEnergies = sysEnergyMapper.selectList(queryWrapper);
- final Map<String, Object> energyCoefficientMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno, SysEnergy::getCoefficient));
+ final Map<String, BigDecimal> energyCoefficientMap = sysEnergies.stream().collect(Collectors.toMap(SysEnergy::getEnersno, SysEnergy::getCoefficient));
final Map<String, String> indexIdEnergyIdMap = new HashMap<>();
nodeIndexInforList.forEach(n->{
final String indexId = n.getIndexId();
@@ -1063,7 +1063,7 @@
final String indexId = dataItem.getIndexId();
final String energyId = indexIdEnergyIdMap.get(indexId);
- final BigDecimal coefficient = (BigDecimal) energyCoefficientMap.get(energyId);
+ final BigDecimal coefficient = energyCoefficientMap.get(energyId);
if(coefficient == null){
throw new RuntimeException("鑳芥簮绫诲瀷" + energyId + "娌℃湁閰嶇疆鎶樻爣绯绘暟锛屾棤娉曡绠�");
}
--
Gitblit v1.9.3