From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
index 6b5bfa3..19ce895 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
@@ -21,6 +21,8 @@
String selectHourlyData(Map<String,Object> params);
+ List<Map<String,Object>> selectHourlyListData(Map<String,Object> params);
+
List<Map<String,Object>> selectDataByMacsAndTime(@Param("timeUnits") String timeUnits, @Param("list")List list, @Param("time")String time);
@@ -37,4 +39,11 @@
//
//
// Map<String,Object> getDataByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
+ void insertHistoryHourly(Map<String, Object> params);
+
+ void updateHistoryHourly(Map<String, Object> params);
+
+ List<HistoryHourly> listResult(Map<String, Object> params);
+
+ List<HistoryHourly> listLikeResult(Map<String, Object> params);
}
--
Gitblit v1.8.0