mfnefd/Cucumber
mfnefd/Cucumber
0
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greenhouseCRUD #7

Merged
mfnefd merged 18 commits from greenhouseCRUD into dev 2024-12-15 20:52:57 +04:00
Conversation 0 Commits 18 Files Changed 35 +55 -31
6 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9c1720e131 - Show all commits

9
Cloud/Controllers/ValveController.cs
View File

@ -1,5 +1,6 @@
using Cloud.Requests;
using Cloud.Services;
using Cloud.Services.Broker;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations;
@ -14,11 +15,11 @@ namespace Cloud.Controllers
{
//Контроллер вентиля
private readonly ProducerService _producerService;
private readonly IBrokerService _kafkaService;
public ValveController(ProducerService producerService)
public ValveController(IBrokerService kafkaService)
{
_producerService = producerService;
_kafkaService = kafkaService;
}
[HttpPost("farm/{farmId}/greenhouse/{ghId}/watering")]
@ -34,7 +35,7 @@ namespace Cloud.Controllers
var message = JsonSerializer.Serialize(kafkaRequest);
return Ok(kafkaRequest);
/*await _producerService.ProduceMessageAsync("ValvesHeatersRequest", message);
/*await _kafkaService.ProduceAsync("ValvesHeatersRequest", message);
return Ok($"Valve status is {request.Action}");*/
}

2
Cloud/Services/Broker/IBrokerConsumer.cs
View File

@ -4,6 +4,6 @@ namespace Cloud.Services.Broker
{
public interface IBrokerConsumer
{
T? WaitMessage<T>(string topic) where T : IBrokerResponse;
IEnumerable<T>? WaitMessages<T>(string topic) where T : IBrokerResponse;
}
}

5
Cloud/Services/Broker/IBrokerService.cs
View File

@ -2,9 +2,8 @@ using Cloud.Services.Broker.Support;
namespace Cloud.Services.Broker
{
public interface IBrokerService
public interface IBrokerService : IBrokerProducer, IBrokerConsumer
{
Task Produce(Command command);
T? Consume<T>(string topic) where T : IBrokerResponse;
void ChangeBrokerIp(string ip);
}
}

34
Cloud/Services/Broker/Implement/Kafka/KafkaConsumer.cs
View File

@ -7,35 +7,31 @@ namespace Cloud.Services.Broker.Implement.Kafka
{
public class KafkaConsumer : IBrokerConsumer
{
private readonly IConsumer<string, string> _consumer;
private IConsumer<string, string> _consumer;
private readonly IConfiguration _config;
public KafkaConsumer(IConfiguration config)
{
var consumerConfig = new ConsumerConfig()
{
BootstrapServers = config["Kafka:BootstrapServers"],
GroupId = config["Kafka:GroupId"],
AutoOffsetReset = AutoOffsetReset.Earliest,
};
_consumer = new ConsumerBuilder<string, string>(consumerConfig).Build();
_config = config;
ChangeBrokerIp(_config["Kafka:BootstrapServers"]);
}
public T? WaitMessage<T>(string topic)
public IEnumerable<T>? WaitMessages<T>(string topic)
where T : IBrokerResponse
{
{
try
{
_consumer.Subscribe(topic);
var consumeResult = _consumer.Consume(TimeSpan.FromMilliseconds(1000));
Console.WriteLine($"================ Received message: {consumeResult?.Message.Value}");
if (consumeResult == null)
{
// No message received from Kafka within the specified timeout.
return default;
}
return JsonSerializer.Deserialize<T>(consumeResult.Message.Value);
return JsonSerializer.Deserialize<IEnumerable<T>>(consumeResult.Message.Value);
}
catch (Exception ex)
@ -47,5 +43,17 @@ namespace Cloud.Services.Broker.Implement.Kafka
_consumer.Close();
}
}
public void ChangeBrokerIp(string ip)
{
var consumerConfig = new ConsumerConfig()
{
BootstrapServers = ip,
GroupId = _config["Kafka:GroupId"],
AutoOffsetReset = AutoOffsetReset.Earliest,
};
_consumer = new ConsumerBuilder<string, string>(consumerConfig).Build();
}
}
}

22
Cloud/Services/Broker/Implement/Kafka/KafkaProducer.cs
View File

@ -5,17 +5,14 @@ namespace Cloud.Services.Broker.Implement.Kafka
{
public class KafkaProducer : IBrokerProducer
{
private readonly IProducer<Guid, Command> _producer;
private IProducer<Guid, Command> _producer;
private readonly IConfiguration _config;
public KafkaProducer(IConfiguration configuration)
{
var producerConfig = new ProducerConfig
{
BootstrapServers = configuration["Kafka:BootstrapServers"]
};
_config = configuration;
//Build the Producer
_producer = new ProducerBuilder<Guid, Command>(producerConfig).Build();
ChangeBrokerIp(_config["Kafka:BootstrapServers"]);
}
public async Task ProduceAsync(string topic, Command command)
{
@ -24,5 +21,16 @@ namespace Cloud.Services.Broker.Implement.Kafka
//Produce the Message
await _producer.ProduceAsync(topic, message);
}
public void ChangeBrokerIp(string ip)
{
var producerConfig = new ProducerConfig
{
BootstrapServers = ip
};
//Build the Producer
_producer = new ProducerBuilder<Guid, Command>(producerConfig).Build();
}
}
}

14
Cloud/Services/Broker/Implement/Kafka/KafkaService.cs
View File

@ -13,10 +13,18 @@ namespace Cloud.Services.Broker.Implement.Kafka
_consumer = new KafkaConsumer(configuration);
}
public T? Consume<T>(string topic)
where T : IBrokerResponse => _consumer.WaitMessage<T>(topic);
public IEnumerable<T>? WaitMessages<T>(string topic)
where T : IBrokerResponse
=> _consumer.WaitMessages<T>(topic);
public async Task Produce(Command command)
public async Task ProduceAsync(string topic, Command command)
=> await _producer.ProduceAsync("commands", command);
public void ChangeBrokerIp(string ip)
{
_consumer.ChangeBrokerIp(ip);
_producer.ChangeBrokerIp(ip);
}
}
}