diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index f08a21f..da52d0f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -123,8 +123,12 @@ levelList.forEach( levelMap -> { alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(levelMap.get("level")) ? "-1" : levelMap.get("level"))); - alarmLevel.setLowValue(levelMap.containsKey("lowValue") ? Float.valueOf(levelMap.get("lowValue")):999); - alarmLevel.setHighValue(levelMap.containsKey("highValue") ? Float.valueOf(levelMap.get("lowValue")):999); + if(levelMap.containsKey("lowValue") &&!StrUtil.isEmpty(levelMap.get("lowValue"))){ + alarmLevel.setLowValue( Float.valueOf(levelMap.get("lowValue"))); + } + if(levelMap.containsKey("highValue") &&!StrUtil.isEmpty(levelMap.get("highValue"))){ + alarmLevel.setLowValue( Float.valueOf(levelMap.get("highValue"))); + } this.save(alarmLevel); } ); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index f08a21f..da52d0f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -123,8 +123,12 @@ levelList.forEach( levelMap -> { alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(levelMap.get("level")) ? "-1" : levelMap.get("level"))); - alarmLevel.setLowValue(levelMap.containsKey("lowValue") ? Float.valueOf(levelMap.get("lowValue")):999); - alarmLevel.setHighValue(levelMap.containsKey("highValue") ? Float.valueOf(levelMap.get("lowValue")):999); + if(levelMap.containsKey("lowValue") &&!StrUtil.isEmpty(levelMap.get("lowValue"))){ + alarmLevel.setLowValue( Float.valueOf(levelMap.get("lowValue"))); + } + if(levelMap.containsKey("highValue") &&!StrUtil.isEmpty(levelMap.get("highValue"))){ + alarmLevel.setLowValue( Float.valueOf(levelMap.get("highValue"))); + } this.save(alarmLevel); } ); diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml index 42d34b6..fe047a6 100644 --- a/casic-web/src/main/resources/config/application-postgre.yml +++ b/casic-web/src/main/resources/config/application-postgre.yml @@ -1,5 +1,5 @@ server: - port: 11308 + port: 11309 ################### spring配置 ################### spring: datasource: