From 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 16:50:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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