From 7a0aeaea540803c0768c10c63ac5e78849f01c7a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 15:25:09 +0800
Subject: [PATCH] 地图相关 bug修复
---
src/main/java/com/moral/controller/ScreenController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index e8bd1c8..4309f5b 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -136,9 +136,8 @@
@GetMapping("alarm-levels")
public Object getAlarmLevels(HttpServletRequest request, Integer orgId) {
List<Map<String,Object>> sensorAlarmList = null;
- AlarmConfigValue alarmConfigValue = null;
try {
- alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();
+ AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();
Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels();
sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {
AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key);
--
Gitblit v1.8.0