From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java | 8 ++++----
1 files changed, 4 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 8b9651c..24ca266 100644
--- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -50,11 +50,11 @@
public Optional 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();
}
}
--
Gitblit v1.8.0