From c2b226e7902dbb2b36f349612886ccc7333895e6 Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Mon, 19 Aug 2019 20:08:44 +0800
Subject: [PATCH] 合并查询无人机平均值,最小值和最大值

---
 src/main/java/com/moral/mapper/HistoryMapper.java |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 9fb75fa..32164b0 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,33 +1,27 @@
 package com.moral.mapper;
 
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Mapper;
+public interface HistoryMapper{
+	String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);
+	List<Map<String, Object>> getAreaAllDataByAccount(Map<String, Object> parameters);
 
-import com.moral.entity.History;
-import com.moral.entity.HistoryExample;
-import org.apache.ibatis.annotations.Param;
+	List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
 
-@Mapper
-public interface HistoryMapper extends BaseMapper<History, HistoryExample, Integer> {
+	List<String> selectNextLevelRegion(Map<String, Object> parameters);
 
-	int countByExample(HistoryExample example);
+	List<Map<String, Object>> getDischargeByRegion(Map<String, Object> parameters);
+	
+	List<Map<String, Object>> getValueByMacAndSize(Map<String, Object> parameters);
 
-	int deleteByExample(HistoryExample example);
+	Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+	
+	Map<String, Object> getAVGValueByMacAndTimeslot(@Param("mac")String mac, @Param("starttime")String starttime, @Param("endtime")String endtime);
 
-	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);
-
-	Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);
-
-	List<Map<String, Object>> getAverageByAll(Map<String, Object> parameters);
+    List<Map<String, Object>> getSensorDataToday(Map<String, Object> parameters);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0