From 5f549c4d7bb36ff4dc012fed9ee1e049dbf899a8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 08 May 2018 09:28:55 +0800
Subject: [PATCH] 运维app getEquInfoByMac api
---
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
index 24ca266..bea09bf 100644
--- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -47,7 +47,7 @@
@Resource
AlarmConfigMapper alarmConfigMapper;
@Override
- public Optional queryValueByOrganizationId(int organizationId) {
+ public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId) {
String key = RedisUtils.getAlarmKey(organizationId);
AlarmConfigValue alarmConfigValue = redisUtils.get(key,new TypeReference<AlarmConfigValue>(){});
if(alarmConfigValue==null) {
@@ -58,13 +58,17 @@
alarmConfigValue = getDefaultAlarmConfigValue();
}
}
- return Optional.of(alarmConfigValue);
+ return Optional.ofNullable(alarmConfigValue);
}
@Override
public Optional<AlarmConfig> queryByOrganizationId(int organizationId) {
AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
- return Optional.of(alarmConfig);
+ if(alarmConfig==null){
+ alarmConfig = new AlarmConfig();
+ alarmConfig.setValue(getDefaultAlarmConfigValue());
+ }
+ return Optional.ofNullable(alarmConfig);
}
@Override
--
Gitblit v1.8.0