From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Mon, 16 Nov 2020 13:16:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/service/AlarmConfigService.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/service/AlarmConfigService.java b/src/main/java/com/moral/service/AlarmConfigService.java index ec6bb06..55ee66e 100644 --- a/src/main/java/com/moral/service/AlarmConfigService.java +++ b/src/main/java/com/moral/service/AlarmConfigService.java @@ -8,8 +8,13 @@ public interface AlarmConfigService { public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId); public Optional<AlarmConfig> queryByOrganizationId(int organizationId); + public String getValueByOrganizationId(int organizationId); public Optional<AlarmConfig> queryByMonitorPointId(int mpId); public AlarmConfigValue getDefaultAlarmConfigValue(); + + Optional<AlarmConfig> queryByDeviceMac(String mac); + void addOrModify(AlarmConfig alarmConfig); + int containOrgId(Integer orgId); } -- Gitblit v1.8.0