From 30038febd6ab68437862fad1988faef89607b74e Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期四, 10 四月 2025 18:25:42 +0800
Subject: [PATCH] 首页全厂能耗占比数据修改和能源损失分析 时间类型修改
---
zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
index a785a08..28d54c7 100644
--- a/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
@@ -76,7 +76,7 @@
final Double tongbiCount = tongbiMap.get(energyNo).stream().map(HomeEnergyStatisticsVO::getCount).mapToDouble(Double::doubleValue).sum();
final Double huanbiCount = huanbiMap.get(energyNo).stream().map(HomeEnergyStatisticsVO::getCount).mapToDouble(Double::doubleValue).sum();
- vo.setTonCount(format2Double(vo.getCount() * Double.valueOf(vo.getCoefficient())));
+ vo.setTonCount(format2Double(count));
if (tongbiCount != 0) {
vo.setTongbi(format2Double((count - tongbiCount) / tongbiCount * 100));
} else {
@@ -378,7 +378,7 @@
if (ObjectUtils.isEmpty(parentNode)) {
return energyDataList;
}
- List<String> nodeIds = modelNodeList.stream().filter(x -> ObjectUtils.isNotEmpty(x.getParentId()))
+ List<String> nodeIds = modelNodeList.stream().filter(x -> ObjectUtils.isNotEmpty(x.getParentId()) && parentNode.getNodeId().equals(x.getParentId()))
.map(ModelNode::getNodeId).collect(Collectors.toList());
if (ObjectUtils.isEmpty(nodeIds)) {
return energyDataList;
--
Gitblit v1.9.3