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/mapper/DataItemMapper.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/dataitem/mapper/DataItemMapper.java b/zhitan-system/src/main/java/com/zhitan/dataitem/mapper/DataItemMapper.java
index 99d5317..3cd7d4e 100644
--- a/zhitan-system/src/main/java/com/zhitan/dataitem/mapper/DataItemMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/dataitem/mapper/DataItemMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhitan.carbonemission.domain.CarbonEmission;
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 org.apache.ibatis.annotations.Param;
@@ -13,7 +14,7 @@
/**
* 闃舵鏁版嵁褰曞叆鎺ュ彛
- *
+ *
* @author sys
* @date 2020-03-25
*/
@@ -80,6 +81,7 @@
/**
* 鏍规嵁indexId涓庢椂闂磋寖鍥存煡璇㈢⒊鎺掓斁鏁版嵁锛屼笂鍗婇儴鍒�
+ *
* @param beginTime
* @param endTime
* @param timeType
@@ -92,6 +94,7 @@
/**
* 鏍规嵁indexId涓庢椂闂磋寖鍥存煡璇㈢⒊鎺掓斁鏁版嵁锛屼腑闂撮儴鍒�
+ *
* @param beginTime
* @param endTime
* @param timeType
@@ -99,10 +102,11 @@
* @return
*/
List<CarbonEmission> getMiddleCarbonEmission(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime,
- @Param("timeType") String timeType, @Param("indexId") String indexId,@Param("emissionType") String emissionType);
+ @Param("timeType") String timeType, @Param("indexId") String indexId, @Param("emissionType") String emissionType);
/**
* 鏍规嵁indexId涓庢椂闂磋寖鍥存煡璇㈢⒊鎺掓斁鏁版嵁锛屼笅鍗婇儴鍒�
+ *
* @param beginTime
* @param endTime
* @param timeType
@@ -110,7 +114,7 @@
* @return
*/
List<CarbonEmission> getDownCarbonEmission(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime,
- @Param("timeType") String timeType, @Param("indexId") String indexId);
+ @Param("timeType") String timeType, @Param("indexId") String indexId);
/**
* 鏍规嵁indexId涓庢椂闂磋寖鍥存煡璇㈠皬鏃剁殑dataitem淇℃伅
@@ -126,13 +130,28 @@
/**
* 鏌ヨ鑳芥簮绫诲瀷闈炵數鐨勭敤閲�
+ *
* @param beginTime
* @param endTime
- * @param timeType 鏃堕棿绫诲瀷
- * @param nodeId 鑺傜偣Id
+ * @param timeType 鏃堕棿绫诲瀷
+ * @param nodeId 鑺傜偣Id
* @param energyType 鑳芥簮绫诲瀷
* @return
*/
BigDecimal getDataItemTimeRangeValueByNodeId(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime,
- @Param("timeType") String timeType, @Param("nodeId") String nodeId, @Param("energyType") String energyType);
+ @Param("timeType") String timeType, @Param("nodeId") String nodeId, @Param("energyType") String energyType);
+
+ /**
+ * 鑳芥簮娑堣�楁帓鍚�
+ *
+ * @param nodeIds
+ * @param timeType
+ * @param beginTime
+ * @param endTime
+ * @return
+ */
+ List<RankingEnergyData> getHomePageConsumptionRanking(@Param("nodeIds") List<String> nodeIds,
+ @Param("timeType") String timeType,
+ @Param("beginTime") Date beginTime,
+ @Param("endTime") Date endTime);
}
--
Gitblit v1.9.3