From 45be44fb95325305373647231ef74e72d1501f8c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 08:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java | 9 +++++++--
1 files changed, 7 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..4a097f7 100644
--- a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
+++ b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
@@ -7,7 +7,12 @@
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);
+
+ String getMacLogByLast();
}
\ No newline at end of file
--
Gitblit v1.8.0