From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/AlarmConfigService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/AlarmConfigService.java b/src/main/java/com/moral/service/AlarmConfigService.java
index 4080244..e34dad5 100644
--- a/src/main/java/com/moral/service/AlarmConfigService.java
+++ b/src/main/java/com/moral/service/AlarmConfigService.java
@@ -1,9 +1,18 @@
package com.moral.service;
import com.moral.entity.alarm.AlarmConfig;
+import com.moral.entity.alarm.AlarmConfigValue;
+
+import java.util.Optional;
public interface AlarmConfigService {
- public AlarmConfig SelectByOrganizationId(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