updated

沈斌

2018-02-08 3120cdd01c8e6a2a1edefb6ff251c026f44dee5c

 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);