From 65f8acb4e6a856e35ed8c6ae3784d482b6f610b9 Mon Sep 17 00:00:00 2001
From: 潘晓明 <hahagongzi2006@163.com>
Date: 星期四, 13 二月 2025 17:37:42 +0800
Subject: [PATCH] 成本趋势分析：月和年没有数据。
---
zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/service/impl/EnergyConsumeDataServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/service/impl/EnergyConsumeDataServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/service/impl/EnergyConsumeDataServiceImpl.java
index 5819d02..ca612f9 100644
--- a/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/service/impl/EnergyConsumeDataServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/service/impl/EnergyConsumeDataServiceImpl.java
@@ -178,10 +178,21 @@
List<EnergyConsumeVO> energyConsumeVOList = new ArrayList<>();
Date startTime = DateTimeUtil.getTime(timeType, timeCode);
Date endTime = DateTimeUtil.getEndTimeByType(timeType, startTime);
+ //缁熻鏁版嵁涓湀鍜屽勾娌℃湁鏁版嵁
+ String queryTimeType = timeType;
+ switch (timeType) {
+ case TimeTypeConst.TIME_TYPE_DAY:
+ queryTimeType = TimeTypeConst.TIME_TYPE_HOUR;
+ break;
+ case TimeTypeConst.TIME_TYPE_MONTH:
+ case TimeTypeConst.TIME_TYPE_YEAR:
+ queryTimeType = TimeTypeConst.TIME_TYPE_DAY;
+ break;
+ }
for (SysEnergy sysEnergyInfo : sysEnergies) {
switch (sysEnergyInfo.getEnersno()) {
case "electric":
- List<ElectricityDataItem> electricityDataItems = peakValleyMapper.getCostTrends(startTime, endTime, timeType, nodeId, sysEnergyInfo.getEnersno());
+ List<ElectricityDataItem> electricityDataItems = peakValleyMapper.getCostTrends(startTime, endTime, queryTimeType, nodeId, sysEnergyInfo.getEnersno());
if (!electricityDataItems.isEmpty()) {
electricityDataItems.forEach(electricityDataItem -> {
EnergyConsumeVO temp = new EnergyConsumeVO();
@@ -193,7 +204,7 @@
}
break;
default:
- List<CarbonEmission> dataItems = dataItemMapper.getMiddleCarbonEmission(startTime, endTime, timeType, nodeId, sysEnergyInfo.getEnersno());
+ List<CarbonEmission> dataItems = dataItemMapper.getMiddleCarbonEmission(startTime, endTime, queryTimeType, nodeId, sysEnergyInfo.getEnersno());
if (!dataItems.isEmpty()) {
dataItems.forEach(electricityDataItem -> {
EnergyConsumeVO temp = new EnergyConsumeVO();
@@ -263,7 +274,7 @@
}
break;
case TimeTypeConst.TIME_TYPE_YEAR:
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
+ SimpleDateFormat formatter = new SimpleDateFormat(DateTimeUtil.COMMON_PATTERN_TO_MONTH_ZH);
energyConsumeVOMap = dataItems.stream().collect(Collectors.groupingBy(li -> formatter.format(li.getDataTime())));
for (int i = 0; i < CommonConst.DIGIT_12; i++) {
Date newDate = DateUtil.offsetMonth(bsTime, i);
@@ -285,6 +296,7 @@
/**
* 璁＄畻璐圭敤鍜岀敤閲�
+ *
* @param energyConsumeVOMap
* @param formatDate
* @param costValueList
--
Gitblit v1.9.3