fengxiang
2018-05-11 fd13d232df7292d93172d1200235a77f286f64ed
src/main/java/com/moral/controller/ScreenController.java
@@ -177,14 +177,16 @@
                 alarmLevelMap.entrySet().stream().forEach(entry -> {
                     //当 increment都为0时,替换为默认值
                     AlarmSensorLevel alarmSensorLevel = entry.getValue();
                     boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item ->  item == 0);
                     if(isAllZero){
                         AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());
                         if(defaultAlarmSensorLevel!=null){
                             alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
                         }else{
                             List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);
                             alarmSensorLevel.setIncrement(tempList);
                     if(alarmSensorLevel.getIncrement()!=null){
                         boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item ->  item == 0);
                         if(isAllZero){
                             AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());
                             if(defaultAlarmSensorLevel!=null){
                                 alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
                             }else{
                                 List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);
                                 alarmSensorLevel.setIncrement(tempList);
                             }
                         }
                     }
                 });