From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +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