报警配置 service

fengxiang

2018-05-10 95b2ec0857220478d6883eed582b67c758bc525a

报警配置 service

 src/main/java/com/moral/controller/AlarmConfigController.java

@@ -4,10 +4,12 @@
import com.moral.common.bean.ResultBean;
import com.moral.common.util.RedisUtil;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.service.AlarmConfigService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Map;

@RestController
@RequestMapping("alarm-config")

 src/main/java/com/moral/service/AlarmConfigService.java

@@ -6,7 +6,7 @@
import java.util.Optional;

public interface AlarmConfigService {
    public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
    public  AlarmConfigValue getDefaultAlarmConfigValue();

 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,7 @@
            alarmConfig = new AlarmConfig();
            alarmConfig.setValue(getDefaultAlarmConfigValue());
        }
        return Optional.of(alarmConfig);
        return Optional.ofNullable(alarmConfig);
    }

    @Override