From f4ed03e33cd777996c697894c4075128546c3a74 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
index ff3a361..d4720d9 100644
--- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -34,7 +34,7 @@
                 alarmConfig.setCreateTime(new Date());
                 alarmConfig.setUpdateTime(new Date());
                 alarmConfigMapper.insertSelective(alarmConfig);
-            }else{
+            }else {
                 alarmConfig.setUpdateTime(new Date());
                 alarmConfigMapper.updateByPrimaryKeySelective(alarmConfig);
             }
@@ -61,13 +61,18 @@
                              alarmSensorLevel.setIncrement(null);
                          }
                      }
-                     List<Float> degressions = alarmSensorLevel.getDegression();
-                     if(degressions!=null){
-                         boolean isDegression =  degressions.size()<3||
-                                 (degressions.get(0)==0&&degressions.get(1)==0&&degressions.get(2)==0);
-                         if(isDegression){
-                             alarmSensorLevel.setDegression(null);
+                     if(alarmSensorLevel.isDegressEnable()){
+                         List<Float> degressions = alarmSensorLevel.getDegression();
+                         if(degressions!=null){
+                             boolean isDegression =  degressions.size()<3||
+                                     (degressions.get(0)==0&&degressions.get(1)==0&&degressions.get(2)==0);
+                             if(isDegression){
+                                 alarmSensorLevel.setDegression(null);
+                             }
                          }
+                     }else{
+                         //���������������������������������
+                         alarmSensorLevel.setDegression(null);
                      }
                  }
           }

--
Gitblit v1.8.0