api接口调整

xufenglei

2018-01-30 24b5764532e012274759d71ed02844ad2eb901e4

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