From 995a527d6e7d2d0cb141f6853b2b7a2a67b8a1c2 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 20 Nov 2020 18:00:22 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job
---
src/main/java/com/moral/mapper/AlarmMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/AlarmMapper.java b/src/main/java/com/moral/mapper/AlarmMapper.java
index 902ca3e..de429fd 100644
--- a/src/main/java/com/moral/mapper/AlarmMapper.java
+++ b/src/main/java/com/moral/mapper/AlarmMapper.java
@@ -7,7 +7,9 @@
public interface AlarmMapper {
- List<Map<String, Object>> getAvgAlarmData(Map<String, Object> devices);
+ List<Map<String, Object>> getAlarmData(Map<String, Object> devices);
+
+ List<String> getMacs(Map<String, Object> devices);
int insertAlarmDaily(List<Map<String,Object>> list);
--
Gitblit v1.8.0