From 82007c3574640614f688479cc6c6e2ef5d729dbd Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 26 Apr 2018 08:59:22 +0800
Subject: [PATCH] Date 时间不做 精确处理
---
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
index 8b9651c..bea09bf 100644
--- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -47,24 +47,28 @@
@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){
+ if(alarmConfigValue==null) {
AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
- if(alarmConfig!=null&&alarmConfig.getValue()!=null){
- alarmConfigValue = alarmConfig.getValue();
- }else{
+ if (alarmConfig != null && alarmConfig.getValue() != null) {
+ alarmConfigValue = alarmConfig.getValue();
+ } else {
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