From 01329695ebf6eea6576d76825181b2f3833297e8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:12:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/mapper/HistoryMapper.java | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 9fb75fa..2247950 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -3,31 +3,14 @@
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.annotations.Mapper;
-
-import com.moral.entity.History;
-import com.moral.entity.HistoryExample;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface HistoryMapper extends BaseMapper<History, HistoryExample, Integer> {
-
- int countByExample(HistoryExample example);
-
- int deleteByExample(HistoryExample example);
-
- int insert(History record);
-
- int insertSelective(History record);
-
- List<History> selectByExample(HistoryExample example);
-
- int updateByExampleSelective(@Param("record") History record, @Param("example") HistoryExample example);
-
- int updateByExample(@Param("record") History record, @Param("example") HistoryExample example);
+public interface HistoryMapper{
Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);
- List<Map<String, Object>> getAverageByAll(Map<String, Object> parameters);
+ Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getSensorsAverageByDevice4Report(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
}
\ No newline at end of file
--
Gitblit v1.8.0