From 9334c8b308436e5f698c89893ad47aca4dfabaa5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 15:22:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 5 +++++
1 files changed, 5 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..6384a47 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,7 @@
//
//
// 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);
}
--
Gitblit v1.8.0