From 8f53335c42239f379a5f8f7ca0e2f9807e3f0aef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 23 Jun 2018 11:06:19 +0800
Subject: [PATCH] 更新部分 代码
---
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 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..75017d5 100644
--- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.TypeReference;
import com.moral.common.bean.Constants;
import com.moral.common.util.RedisUtils;
+import com.moral.entity.MonitorPoint;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmConfigValue;
import com.moral.entity.alarm.AlarmMode;
@@ -47,24 +48,40 @@
@Resource
AlarmConfigMapper alarmConfigMapper;
@Override
- public Optional 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){
+ if(alarmConfigValue==null) {
AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
- if(alarmConfig!=null&&alarmConfig.getValue()!=null){
- alarmConfigValue = alarmConfig.getValue();
- }else{
+ if (alarmConfig != null && alarmConfig.getValue() != null) {
+ return Optional.ofNullable(alarmConfig);
+ } else {
alarmConfigValue = getDefaultAlarmConfigValue();
}
}
- return Optional.of(alarmConfigValue);
+ AlarmConfig alarmConfigNotWithId = new AlarmConfig();
+ alarmConfigNotWithId.setValue(alarmConfigValue);
+ return Optional.ofNullable(alarmConfigNotWithId);
}
@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
+ public Optional<AlarmConfig> queryByMonitorPointId(int mpId) {
+ AlarmConfig alarmConfig = alarmConfigMapper.selectByMonitorPointId(mpId);
+ if(alarmConfig==null){
+ alarmConfig = new AlarmConfig();
+ alarmConfig.setValue(getDefaultAlarmConfigValue());
+ }
+ return Optional.ofNullable(alarmConfig);
}
@Override
--
Gitblit v1.8.0