From 33ca0da19b3f87751662de0072c48ce9ce963202 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 31 Jul 2019 15:33:49 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/AlarmConfigService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/AlarmConfigService.java b/src/main/java/com/moral/service/AlarmConfigService.java
index deab064..e34dad5 100644
--- a/src/main/java/com/moral/service/AlarmConfigService.java
+++ b/src/main/java/com/moral/service/AlarmConfigService.java
@@ -6,10 +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