Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

jinpengyong

2023-08-23 8c741905bff160816524a54df00a4acca684b770

 screen-api/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java

@@ -31,6 +31,8 @@
    private int concurrency;
    @Value("${kafka.groupId.second-data}")
    private String secondDataGroupId;
    @Value("${kafka.groupId.cruiser-data}")
    private String cruiserDataGroupId;

    @Bean
    public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String, String>> kafkaListenerContainerFactory() {
@@ -44,11 +46,20 @@
    public ConsumerFactory<String, String> consumerFactory() {
        return new DefaultKafkaConsumerFactory<>(consumerConfigs());
    }
    

    @Bean("secondDataListenerFactory")
    public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String, String>> secondDataListenerFactory(){
        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
        factory.setConsumerFactory(secondDataConsumerFactory());//设置消费者工厂
        factory.setConcurrency(concurrency);//设置线程数
        factory.getContainerProperties().setPollTimeout(1500);//设置拉取数据超时时间
        return factory;
    }

    @Bean("cruiserDataListenerFactory")
    public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String, String>> cruiserDataListenerFactory(){
        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
        factory.setConsumerFactory(cruiserDataConsumerFactory());//设置消费者工厂
        factory.setConcurrency(concurrency);//设置线程数
        factory.getContainerProperties().setPollTimeout(1500);//设置拉取数据超时时间
        return factory;
@@ -68,6 +79,16 @@
        return new DefaultKafkaConsumerFactory<>(secondDataConfig);
    }

    /*
    * 走航车数据消费工厂
    * */
    public ConsumerFactory<String,String> cruiserDataConsumerFactory(){
        Map<String, Object> commonConfig = consumerConfigs();
        Map<String, Object> secondDataConfig = cruiserConsumerConfigs();
        secondDataConfig.putAll(commonConfig);
        return new DefaultKafkaConsumerFactory<>(secondDataConfig);
    }

    /**
    * @Description: 秒级消费者配置
            * @Param: []
@@ -81,6 +102,14 @@
        return propsMap;
    }

    /*
    * 走航车消费组配置
    * */
    public Map<String,Object> cruiserConsumerConfigs(){
        Map<String, Object> propsMap = new HashMap<>();
        propsMap.put(ConsumerConfig.GROUP_ID_CONFIG, cruiserDataGroupId);
        return propsMap;
    }

    /**
    * @Description: 通用配置