From 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 17 Aug 2018 17:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
index 75017d5..6ea34b6 100644
--- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -85,6 +85,16 @@
}
@Override
+ public Optional<AlarmConfig> queryByDeviceMac(String mac) {
+ AlarmConfig alarmConfig = alarmConfigMapper.selectByDeviceMac(mac);
+ if(alarmConfig==null){
+ alarmConfig = new AlarmConfig();
+ alarmConfig.setValue(getDefaultAlarmConfigValue());
+ }
+ return Optional.ofNullable(alarmConfig);
+ }
+
+ @Override
public void addOrModify(AlarmConfig alarmConfig) {
try{
if(alarmConfig.getId()==null){
--
Gitblit v1.8.0