From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Tue, 13 Mar 2018 16:25:20 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git --- src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java index cfc8941..7149776 100644 --- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java +++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java @@ -1,5 +1,10 @@ package com.moral.mapper; +import com.moral.entity.charts.DataCondition; +import com.moral.entity.charts.PairData; +import com.moral.entity.charts.TimePeriod; +import org.apache.ibatis.annotations.Param; + import java.util.List; import java.util.Map; @@ -8,5 +13,5 @@ Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters); List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters); - + List<PairData> selectLineChartDateByCrieria(@Param("sensorKey") String sensorKey, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition); } \ No newline at end of file -- Gitblit v1.8.0