UNOV/manager-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add MQTT events

Browse Source
This commit is contained in:
Thomas Fransolet 2023-12-05 15:40:51 +01:00
parent 0b0b54c6af
commit 2866c12985
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ManagerService/Controllers/ConfigurationController.cs
View File

@ -232,7 +232,7 @@ namespace ManagerService.Controllers
Configuration configurationModified = _configurationService.Update(updatedConfiguration.id, configuration);
// TODO HANDLE MqttClientService.PublishMessage($"config/{configurationModified.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
MqttClientService.PublishMessage($"config/{configurationModified.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
List<string> sectionIds = _sectionService.GetAllIdsFromConfiguration(configuration.Id);
@ -284,7 +284,7 @@ namespace ManagerService.Controllers
_deviceService.Update(device.Id, device);
}
// TODO MqttClientService.PublishMessage($"config/{id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true, isDeleted = true }));
MqttClientService.PublishMessage($"config/{id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true, isDeleted = true }));
return new ObjectResult("The configuration has been deleted") { StatusCode = 202 };

2
ManagerService/Controllers/DeviceController.cs
View File

@ -242,7 +242,7 @@ namespace ManagerService.Controllers
Device deviceModified = _deviceService.Update(device.Id, device);
// TODO MqttClientService.PublishMessage($"player/{device.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
MqttClientService.PublishMessage($"player/{device.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
return new OkObjectResult(deviceModified.ToDTO());
}

4
ManagerService/Controllers/SectionController.cs
View File

@ -533,7 +533,7 @@ namespace ManagerService.Controllers
Section sectionModified = _sectionService.Update(updatedSection.id, section);
// TODO MqttClientService.PublishMessage($"config/{sectionModified.ConfigurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
MqttClientService.PublishMessage($"config/{sectionModified.ConfigurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
return new OkObjectResult(sectionModified.ToDTO());
}
@ -582,7 +582,7 @@ namespace ManagerService.Controllers
}
if (updatedSectionsOrder.Count > 0) {
// TODO MqttClientService.PublishMessage($"config/{updatedSectionsOrder[0].configurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
MqttClientService.PublishMessage($"config/{updatedSectionsOrder[0].configurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
}
return new ObjectResult("Sections order has been successfully modified") { StatusCode = 200 };

6
ManagerService/Extensions/MqttClientService.cs
View File

@ -27,9 +27,9 @@ namespace Mqtt.Client.AspNetCore.Services
public MqttClientService(IMqttClientOptions options)
{
var server = "localhost";
var server = "mymuseum.be";
#if DEBUG
server = "localhost";//"192.168.31.96";
server = "mymuseum.be";//"192.168.31.96";
#endif
this.options = options;
this.options = new MqttClientOptionsBuilder()
@ -141,7 +141,7 @@ namespace Mqtt.Client.AspNetCore.Services
.WithRetainFlag(false)
.Build();
if (mqttClient.IsConnected)
if (mqttClient != null && mqttClient.IsConnected)
await mqttClient.PublishAsync(mqttMessage);
}

4
ManagerService/Startup.cs
View File

@ -41,7 +41,7 @@ namespace ManagerService
{
Configuration = configuration;
//MapConfiguration();
MapConfiguration();
}
public IConfiguration Configuration { get; }
@ -133,7 +133,7 @@ namespace ManagerService
};
});
//services.AddMqttClientHostedService();
services.AddMqttClientHostedService();
services.AddScoped(typeof(ProfileLogic));
services.AddScoped<TokensService>();
services.AddScoped<UserDatabaseService>();