From 16d77a440e12c3de262c48c79af5fc0494dd87b7 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 11 四月 2025 18:42:19 +0800
Subject: [PATCH] Merge pull request #52 from zhitan-cloud/zhangjw
---
zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 2f95c17..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
@@ -1,6 +1,9 @@
package com.zhitan.dataitem.service.impl;
+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;
@@ -149,16 +152,20 @@
public FlowChartsVO getFlowCharts(FlowChartsDTO dto) {
FlowChartsVO flowChartsVO = new FlowChartsVO();
// 鐖惰妭鐐筰d
- String nodeId = dto.getNodeId();
+ LambdaQueryWrapper<ModelNode> wrapper = Wrappers.<ModelNode>lambdaQuery()
+ .eq(ModelNode::getModelCode, dto.getModelCode())
+ .isNull(ModelNode::getParentId);
+ List<ModelNode> modelNodes = modelNodeMapper.selectList(wrapper);
+ if (ObjectUtils.isEmpty(modelNodes)) {
+ throw new RuntimeException("鏈煡璇㈠埌妯″瀷淇℃伅");
+ }
+ 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);
@@ -207,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