From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/mapper/HistoryMapper.java | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 9fb75fa..6fd31b0 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -1,33 +1,25 @@
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);
-
- 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);
+ Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+
+ Map<String, Object> getAVGValueByMacAndTimeslot(@Param("mac")String mac, @Param("starttime")String starttime, @Param("endtime")String endtime);
}
\ No newline at end of file
--
Gitblit v1.8.0