From 9880d87f87b074b45150a66867c0d1870e6cb3e2 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 06 Aug 2020 14:31:13 +0800 Subject: [PATCH] update --- src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java index 12ba243..ecb0b2d 100644 --- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java +++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java @@ -10,27 +10,25 @@ public interface HistoryMinutelyMapper { - Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters); + Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters); - Map<String, Double> getAvgByDevice(Map<String, Object> parameters); + Map<String, Double> getAvgByDevice(Map<String, Object> parameters); - List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters); + List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters); - List<Map<String, Object>> getAreaAvgDataByAreaCode(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); - /** - * @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>> getSensorData(Map<String, Object> parameters); - List<Map<String, Object>> getSensorData(Map<String, Object> parameters); + List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters); - List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters); + List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters); - List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters); - - List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters); + List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters); } -- Gitblit v1.8.0