波动补偿

于紫祥_1901

2020-12-24 f28149d8183a62f87fa9c8df9ae589070d83f612

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

@@ -75,8 +75,23 @@
    }

    @Override
    public String getValueByOrganizationId(int organizationId) {
        return alarmConfigMapper.getValueByOrganizationId(organizationId);
    }

    @Override
    public Optional<AlarmConfig> queryByMonitorPointId(int mpId) {
        AlarmConfig alarmConfig = alarmConfigMapper.selectByMonitorPointId(mpId);
        if(alarmConfig==null){
            alarmConfig = new AlarmConfig();
            alarmConfig.setValue(getDefaultAlarmConfigValue());
        }
        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());
@@ -102,6 +117,12 @@
            throw  ex;
        }
    }

    @Override
    public int containOrgId(Integer orgId) {
        return alarmConfigMapper.containOrgId(orgId);
    }

    public AlarmConfigValue simplifyAlarmConfigValue(AlarmConfigValue value){
          Map<String,AlarmSensorLevel> alarmSensorLevelMap = value.getAlarmLevels();
          List<String> cleanKeys = new ArrayList<>();