设备默认新增状态为4离线

fengxiang

2018-04-23 3fb41a7431142a4f4a9794cba32be2ad37a6f14a

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

@@ -47,24 +47,28 @@
    @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){
        if(alarmConfigValue==null) {
            AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
            if(alarmConfig!=null&&alarmConfig.getValue()!=null){
                alarmConfigValue  = alarmConfig.getValue();
            }else{
            if (alarmConfig != null && alarmConfig.getValue() != null) {
                alarmConfigValue = alarmConfig.getValue();
            } else {
                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