From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
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