From 083cfcba6a2480422ab53c63c37a95ff310946e8 Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期三, 26 三月 2025 20:05:59 +0800
Subject: [PATCH] 首页-厂区能耗排名TOP5和碳排放量核算-顶部数据，BUG修改
---
zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
index e9d2514..edc291a 100644
--- a/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
@@ -12,7 +12,7 @@
import com.zhitan.common.utils.DateTimeUtil;
import com.zhitan.common.utils.PropUtils;
import com.zhitan.dataitem.service.IDataItemService;
-import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
+import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
import com.zhitan.model.mapper.ModelNodeMapper;
import com.zhitan.realtimedata.domain.DataItem;
import lombok.AllArgsConstructor;
@@ -29,7 +29,7 @@
* 鍒嗛」鐢ㄨ兘鍒嗘瀽
*
* @author sys
- * @date 2021-01-11
+ * @date 2025-03-25
*/
@Service
@AllArgsConstructor
@@ -49,18 +49,18 @@
String timeType = dto.getTimeType();
String dataTime = dto.getDataTime();
- Date beginTime = DateTimeUtil.getTypeTime(timeType, dataTime);
+ Date beginTime = DateTimeUtil.getTime(timeType, dataTime);
DateTime endTime = null;
// 鑾峰彇鑺傜偣淇℃伅
- List<ModelNodeIndexInfor> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
- List<String> indexList = nodeIndexInfo.stream().map(ModelNodeIndexInfor::getIndexId).collect(Collectors.toList());
+ List<ModelNodeIndexInfo> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
+ List<String> indexList = nodeIndexInfo.stream().map(ModelNodeIndexInfo::getIndexId).collect(Collectors.toList());
if(ObjectUtil.isEmpty(indexList)){
return new ItemizedEnergyAnalysisVO();
}
- ModelNodeIndexInfor info = nodeIndexInfo.stream().findFirst().get();
+ ModelNodeIndexInfo info = nodeIndexInfo.stream().findFirst().get();
// 鏍规嵁鏃堕棿绫诲瀷璋冩暣鏃堕棿鑼冨洿
switch (dto.getTimeType()) {
--
Gitblit v1.9.3