From 0fd34e51dadbf9598188b0e061b658139e6d6257 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Jun 2018 13:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/AlarmConfigService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/AlarmConfigService.java b/src/main/java/com/moral/service/AlarmConfigService.java
index 4080244..ec6bb06 100644
--- a/src/main/java/com/moral/service/AlarmConfigService.java
+++ b/src/main/java/com/moral/service/AlarmConfigService.java
@@ -1,9 +1,15 @@
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();
void addOrModify(AlarmConfig alarmConfig);
+
}
--
Gitblit v1.8.0