xufenglei
2018-05-24 8ea24dd5fb6e1b24d3a7ef62a0060ef516f8f759
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)