From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-system/src/main/java/com/zhitan/dataitem/service/IDataItemService.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/dataitem/service/IDataItemService.java b/zhitan-system/src/main/java/com/zhitan/dataitem/service/IDataItemService.java
index 993beb7..fc3fc36 100644
--- a/zhitan-system/src/main/java/com/zhitan/dataitem/service/IDataItemService.java
+++ b/zhitan-system/src/main/java/com/zhitan/dataitem/service/IDataItemService.java
@@ -2,8 +2,11 @@
import com.zhitan.common.enums.TimeType;
+import com.zhitan.consumptionanalysis.domain.vo.RankingEnergyData;
import com.zhitan.dataitem.domain.StagseDataEntry;
import com.zhitan.realtimedata.domain.DataItem;
+import com.zhitan.statisticalAnalysis.domain.dto.FlowChartsDTO;
+import com.zhitan.statisticalAnalysis.domain.vo.FlowChartsVO;
import java.math.BigDecimal;
import java.util.Date;
@@ -88,4 +91,22 @@
* @return
*/
List<DataItem> getDataItemHourInforByIndexIds(Date beginTime, Date endTime, String timeType, List<String> indexIds);
+
+ /**
+ * 鑾峰彇鑳芥祦鍥惧舰鍒嗘瀽
+ *
+ * @param dto 璇锋眰鍙傛暟
+ * @return 缁撴灉
+ */
+ FlowChartsVO getFlowCharts(FlowChartsDTO dto);
+
+ /**
+ * 鑾峰彇棣栭〉鑳借�楁帓鍚�
+ * @param nodeIds
+ * @param timeType
+ * @param beginTime
+ * @param endTime
+ * @return
+ */
+ List<RankingEnergyData> getHomePageConsumptionRanking(List<String> nodeIds, String timeType, Date beginTime, Date endTime);
}
--
Gitblit v1.9.3