From c0d88c1f82394c0374d2d592f4d2bca951d6334e Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 14 May 2018 15:58:07 +0800
Subject: [PATCH] 报表展示 增加行业筛选
---
src/main/java/com/moral/controller/ScreenController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 0968946..f7d72e0 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/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);
+ }
}
}
});
--
Gitblit v1.8.0