组织报警间隔时间

fengxiang

2018-04-17 ac5c0ea75ed3606ff675c70c4456241495c2c8a9

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

@@ -47,7 +47,7 @@
    @Resource
    AlarmConfigMapper alarmConfigMapper;
    @Override
    public Optional queryValueByOrganizationId(int organizationId) {
    public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId) {
        String key = RedisUtils.getAlarmKey(organizationId);
        AlarmConfigValue alarmConfigValue = redisUtils.get(key,new TypeReference<AlarmConfigValue>(){});
        if(alarmConfigValue==null) {
@@ -58,13 +58,17 @@
                alarmConfigValue = getDefaultAlarmConfigValue();
            }
        }
        return Optional.of(alarmConfigValue);
        return Optional.ofNullable(alarmConfigValue);
    }

    @Override
    public Optional<AlarmConfig> queryByOrganizationId(int organizationId) {
        AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
        return Optional.of(alarmConfig);
        if(alarmConfig==null){
            alarmConfig = new AlarmConfig();
            alarmConfig.setValue(getDefaultAlarmConfigValue());
        }
        return Optional.ofNullable(alarmConfig);
    }

    @Override