From ef431a71ed043e8fb63777793df23c110b853803 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 09:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/AlarmConfigService.java | 8 ++++++--
1 files changed, 6 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..edb5503 100644
--- a/src/main/java/com/moral/service/AlarmConfigService.java
+++ b/src/main/java/com/moral/service/AlarmConfigService.java
@@ -1,9 +1,13 @@
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<AlarmConfigValue> queryValueByOrganizationId(int organizationId);
+ public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
+ public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
void addOrModify(AlarmConfig alarmConfig);
}
--
Gitblit v1.8.0