微型站5分钟与半小时数据

jinpengyong

2020-09-08 adde1ed1a99622c80a95dea83e294711d295c55c

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

@@ -48,18 +48,20 @@
    @Resource
    AlarmConfigMapper alarmConfigMapper;
    @Override
    public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId) {
    public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId) {
        String key = RedisUtils.getAlarmKey(organizationId);
        AlarmConfigValue alarmConfigValue = redisUtils.get(key,new TypeReference<AlarmConfigValue>(){});
        if(alarmConfigValue==null) {
            AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
            if (alarmConfig != null && alarmConfig.getValue() != null) {
                alarmConfigValue = alarmConfig.getValue();
                return Optional.ofNullable(alarmConfig);
            } else {
                alarmConfigValue = getDefaultAlarmConfigValue();
            }
        }
        return Optional.ofNullable(alarmConfigValue);
        AlarmConfig alarmConfigNotWithId = new AlarmConfig();
        alarmConfigNotWithId.setValue(alarmConfigValue);
        return Optional.ofNullable(alarmConfigNotWithId);
    }

    @Override
@@ -79,7 +81,17 @@
            alarmConfig = new AlarmConfig();
            alarmConfig.setValue(getDefaultAlarmConfigValue());
        }
        return Optional.of(alarmConfig);
        return Optional.ofNullable(alarmConfig);
    }

    @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