From 3b50aa4a23bd3ccb2bf71109b84dea65bd9ffc07 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 06 May 2020 11:02:25 +0800 Subject: [PATCH] update --- src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java index 4e1b68f..ca530b5 100644 --- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java +++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java @@ -10,25 +10,27 @@ public interface HistoryMinutelyMapper { - Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters); + Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters); - List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters); + Map<String, Double> getAvgByDevice(Map<String, Object> parameters); - List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters); + List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters); - /** - * @param sensorKeys - * @param timePeriod - * @param dataCondition - * @return {format_time:string,e1:double,e2...............} - */ - List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys") List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition); + List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters); - List<Map<String, Object>> getSensorData(Map<String, Object> parameters); + /** + * @param sensorKeys + * @param timePeriod + * @param dataCondition + * @return {format_time:string,e1:double,e2...............} + */ + List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys") List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("timeUnits") String timeUnits, @Param("dataCondition") DataCondition dataCondition); - List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters); + List<Map<String, Object>> getSensorData(Map<String, Object> parameters); - List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters); + List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters); - List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters); + List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters); + + List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters); } -- Gitblit v1.8.0