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/peakvalley/mapper/PeakValleyMapper.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/peakvalley/mapper/PeakValleyMapper.java b/zhitan-system/src/main/java/com/zhitan/peakvalley/mapper/PeakValleyMapper.java index 22b3312..98b4e01 100644 --- a/zhitan-system/src/main/java/com/zhitan/peakvalley/mapper/PeakValleyMapper.java +++ b/zhitan-system/src/main/java/com/zhitan/peakvalley/mapper/PeakValleyMapper.java @@ -27,4 +27,27 @@ */ List<ElectricityDataItem> getDataStatistics(@Param("indexIdSet") Set<String> indexIdSet, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("timeType") String timeType); + + /** + * 鏌ヨ灏栧嘲骞宠胺缁熻鏁版嵁(鍋忓樊鍒嗘瀽) + * + * @param indexIdSet 鐐逛綅id闆嗗悎 + * @param timeType 鏃堕棿绫诲瀷 + * @return 缁撴灉 + */ + List<ElectricityDataItem> getDataStatisticsDeviationAnalysis(@Param("indexIdSet") Set<String> indexIdSet, + @Param("timeType") String timeType); + + /** + * 鏌ヨ鎴愭湰瓒嬪娍 + * @param beginTime + * @param endTime + * @param timeType 鏃堕棿绫诲瀷 + * @param nodeId 鑺傜偣Id + * @param energyType 鑳芥簮绫诲瀷 + * @return + */ + List<ElectricityDataItem> getCostTrends(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime, + @Param("timeType") String timeType, @Param("nodeId") String nodeId,@Param("energyType") String energyType); + } -- Gitblit v1.9.3