From d26d1fba7d3f8db6eb87f9da6c25b8a98de6e1ea Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Oct 2023 16:40:55 +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