Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-09-02 e8ef361dc975aeaedeee6f28dfe679489a22f9d5

 src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java

@@ -85,6 +85,16 @@
    }

    @Override
    public Optional<AlarmConfig> queryByDeviceMac(String mac) {
        AlarmConfig alarmConfig = alarmConfigMapper.selectByDeviceMac(mac);
        if(alarmConfig==null){
            alarmConfig = new AlarmConfig();
            alarmConfig.setValue(getDefaultAlarmConfigValue());
        }
        return Optional.ofNullable(alarmConfig);
    }

    @Override
    public void addOrModify(AlarmConfig alarmConfig) {
        try{
            if(alarmConfig.getId()==null){