From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 deab064..55ee66e 100644
--- a/src/main/java/com/moral/service/AlarmConfigService.java
+++ b/src/main/java/com/moral/service/AlarmConfigService.java
@@ -6,10 +6,15 @@
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 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