Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-02-13 e2dced9dcd39fb53566020c53e131400daac01e6

 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);

}