From d1f1b489eea7730bb1cb78cdae24c626db835298 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 30 Apr 2020 11:24:16 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 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 bea09bf..6ea34b6 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,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
@@ -72,6 +75,26 @@
}
@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
+ public Optional<AlarmConfig> queryByDeviceMac(String mac) {
+ AlarmConfig alarmConfig = alarmConfigMapper.selectByDeviceMac(mac);
+ if(alarmConfig==null){
+ alarmConfig = new AlarmConfig();
+ alarmConfig.setValue(getDefaultAlarmConfigValue());
+ }
+ return Optional.ofNullable(alarmConfig);
+ }
+
+ @Override
public void addOrModify(AlarmConfig alarmConfig) {
try{
if(alarmConfig.getId()==null){
--
Gitblit v1.8.0