From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0
---
zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java
index 2256b65..1f14463 100644
--- a/zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhitan.common.enums.TimeType;
+import com.zhitan.consumptionanalysis.domain.vo.RankingEnergyData;
import com.zhitan.dataitem.domain.StagseDataEntry;
import com.zhitan.dataitem.domain.vo.NodeIndexValueVO;
import com.zhitan.dataitem.mapper.DataItemMapper;
@@ -155,7 +156,7 @@
.eq(ModelNode::getModelCode, dto.getModelCode())
.isNull(ModelNode::getParentId);
List<ModelNode> modelNodes = modelNodeMapper.selectList(wrapper);
- if(ObjectUtils.isEmpty(modelNodes)){
+ if (ObjectUtils.isEmpty(modelNodes)) {
throw new RuntimeException("鏈煡璇㈠埌妯″瀷淇℃伅");
}
ModelNode modelNode = modelNodes.stream().findFirst().get();
@@ -213,6 +214,11 @@
return flowChartsVO;
}
+ @Override
+ public List<RankingEnergyData> getHomePageConsumptionRanking(List<String> nodeIds, String timeType, Date beginTime, Date endTime) {
+ return dataItemMapper.getHomePageConsumptionRanking(nodeIds, timeType, beginTime, endTime);
+ }
+
/**
* 鏍规嵁indexId鏌ヨ鑳借�楁暟鎹�
*/
--
Gitblit v1.9.3