From 6188c6489f180ecd65c13b40cf68ca1a09d352b1 Mon Sep 17 00:00:00 2001
From: DYL0109 <1332079466@qq.com>
Date: 星期一, 20 一月 2025 18:06:28 +0800
Subject: [PATCH] !29 优化 Merge pull request !29 from DYL0109/dyl_dev
---
zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 00d47cb..201c59f 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
@@ -237,7 +237,7 @@
final List<ElectricityDataItem> electricityDataItems = electricityDataMap.get(vo.getTimeType());
if(null != electricityDataItems) {
final double sum = electricityDataItems.stream().map(ElectricityDataItem::getElectricity).mapToDouble(BigDecimal::doubleValue).sum();
- vo.setCount(sum);
+ vo.setCount(format2Double(sum));
if(totalElectric != 0) {
vo.setPercentage(format2Double(sum / totalElectric * 100));
}
@@ -390,8 +390,8 @@
}
});
List<String> indexIds = nodeIndexInforList.stream().filter(l -> StringUtils.isNotEmpty(l.getIndexId())).map(ModelNodeIndexInfor::getIndexId).collect(Collectors.toList());
-// Date queryTime = new Date();
- Date queryTime = DateUtil.parseDateTime("2023-03-28 00:00:00");
+ Date queryTime = new Date();
+// Date queryTime = DateUtil.parseDateTime("2023-03-28 00:00:00");
Date beginTime;
Date endTime;
String shixuTimeType;
--
Gitblit v1.9.3