From bccec4058028562c0811711d55446d68bb6aa996 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 13:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
index 39789e9..717a9d2 100644
--- a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
+++ b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
@@ -7,7 +7,10 @@
import com.moral.monitor.entity.HistoryEntityExample;
public interface HistoryEntityMapper extends BaseDao<HistoryEntity, HistoryEntityExample, Integer>{
- Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
- List<Map<String, Object>> getAverageByAll(Map<String, Object> parameters);
+ Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getAverageByAll(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getEquipmentStates(Map<String, Object> parameters);
}
\ No newline at end of file
--
Gitblit v1.8.0