From f600872a54da4b41ed137c3361f685604e47ee9d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 17:18:23 +0800
Subject: [PATCH] 编辑 设备 redis里组织id清空bug修复。
---
src/main/java/com/moral/controller/AlarmController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/AlarmController.java b/src/main/java/com/moral/controller/AlarmController.java
index ce4cf51..d026fa0 100644
--- a/src/main/java/com/moral/controller/AlarmController.java
+++ b/src/main/java/com/moral/controller/AlarmController.java
@@ -53,7 +53,10 @@
if(!CollectionUtils.isEmpty(device.getOrganizationIds())){
List<Sensor> sensorList = sensorService.queryByVersionId(device.getDeviceVersionId()).getData();
String data = historyService.queryValueByMacAndTime(alarm.getMac(),alarm.getTime());
- AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(device.getOrganizationIds().get(0)).get();
+ AlarmConfigValue alarmConfigValue
+ = alarmConfigService
+ .queryValueByOrganizationId(device.getOrganizationIds().get(0))
+ .get().getValue();
if(device!=null
&&!CollectionUtils.isEmpty(sensorList)
&&!StringUtils.isEmpty(data)
--
Gitblit v1.8.0