From c21c161bc5ecddbe2a1d5174c2d178d768939e17 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 26 Jan 2024 09:56:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java b/screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
index dd466df..f2798fc 100644
--- a/screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
+++ b/screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
@@ -7,5 +7,9 @@
 
     void createTable(String timeUnits);
 
-    List<Map<String, Object>> getHistoryFiveMinutelyData(Map<String,Object> params);
+    List<Map<String, Object>> getHistoryMinutelyData(Map<String, Object> params);
+
+    List<String> getHistoryMinutelyMacData(Map<String, Object> params);
+
+    List<Map<String, Object>> getHourlyData(Map<String, Object> params);
 }

--
Gitblit v1.8.0