From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 27fb12a..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,21 +156,16 @@
.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("鏈煡璇㈠埌妯″瀷淇℃伅");
}
- Optional<ModelNode> modelNodeInfo = modelNodes.stream().findFirst();
- String nodeId = modelNodeInfo.map(ModelNode::getNodeId).toString();
+ ModelNode modelNode = modelNodes.stream().findFirst().get();
+ String nodeId = modelNode.getNodeId();
dto.setNodeId(nodeId);
String energyType = dto.getEnergyType();
LocalDate queryTime = dto.getQueryTime();
TimeType timeType = dto.getTimeType();
- // 鑾峰彇鑺傜偣淇℃伅
- ModelNode modelNode = modelNodeMapper.selectModelNodeById(nodeId);
- if (ObjectUtils.isEmpty(modelNode)) {
- return flowChartsVO;
- }
// 鑾峰彇鏌ヨ鏃堕棿
Map<String, LocalDateTime> dateTimeMap = getDataItemByIndexId(timeType, queryTime);
@@ -218,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