From 95b2ec0857220478d6883eed582b67c758bc525a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 17:20:32 +0800
Subject: [PATCH] 报警配置 service
---
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
index 8bd9c7f..75017d5 100644
--- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -48,18 +48,20 @@
@Resource
AlarmConfigMapper alarmConfigMapper;
@Override
- public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId) {
+ public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId) {
String key = RedisUtils.getAlarmKey(organizationId);
AlarmConfigValue alarmConfigValue = redisUtils.get(key,new TypeReference<AlarmConfigValue>(){});
if(alarmConfigValue==null) {
AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
if (alarmConfig != null && alarmConfig.getValue() != null) {
- alarmConfigValue = alarmConfig.getValue();
+ return Optional.ofNullable(alarmConfig);
} else {
alarmConfigValue = getDefaultAlarmConfigValue();
}
}
- return Optional.ofNullable(alarmConfigValue);
+ AlarmConfig alarmConfigNotWithId = new AlarmConfig();
+ alarmConfigNotWithId.setValue(alarmConfigValue);
+ return Optional.ofNullable(alarmConfigNotWithId);
}
@Override
@@ -79,7 +81,7 @@
alarmConfig = new AlarmConfig();
alarmConfig.setValue(getDefaultAlarmConfigValue());
}
- return Optional.of(alarmConfig);
+ return Optional.ofNullable(alarmConfig);
}
@Override
--
Gitblit v1.8.0