From e66e35663ae576c94d4772195bd224bfaf580ec7 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 13 Aug 2019 11:12:00 +0800
Subject: [PATCH] 判断无人机查询起始时间是否是前一个小时内,调用不同的查询接口

---
 src/main/java/com/moral/service/AlarmConfigService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/AlarmConfigService.java b/src/main/java/com/moral/service/AlarmConfigService.java
index edb5503..e34dad5 100644
--- a/src/main/java/com/moral/service/AlarmConfigService.java
+++ b/src/main/java/com/moral/service/AlarmConfigService.java
@@ -6,8 +6,13 @@
 import java.util.Optional;
 
 public interface AlarmConfigService {
-    public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId);
+    public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId);
     public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
     public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
+    public  AlarmConfigValue getDefaultAlarmConfigValue();
+
+    Optional<AlarmConfig> queryByDeviceMac(String mac);
+
     void addOrModify(AlarmConfig alarmConfig);
+
 }

--
Gitblit v1.8.0