From 2d7e80b3a185e3ced22dc1febfda9c1881f32f96 Mon Sep 17 00:00:00 2001 From: Jeas0001 Date: Mon, 24 Mar 2025 12:00:04 +0100 Subject: [PATCH] Mqttreciever --- backend/Api/Controllers/DeviceController.cs | 6 +++--- backend/Api/Controllers/UserController.cs | 4 ++-- backend/Api/DBAccess/DBAccess.cs | 16 ++++++++++++++++ backend/Api/Program.cs | 13 +++++++++++++ 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/backend/Api/Controllers/DeviceController.cs b/backend/Api/Controllers/DeviceController.cs index d936fdb..2c65ee5 100644 --- a/backend/Api/Controllers/DeviceController.cs +++ b/backend/Api/Controllers/DeviceController.cs @@ -28,21 +28,21 @@ namespace Api.Controllers return await _deviceLogic.GetDevices(userId); } - [Authorize] + //[Authorize] [HttpPost("adddevice/{userId}")] public async Task AddDevice([FromBody] Device device, int userId) { return await _deviceLogic.AddDevice(device, userId); } - [Authorize] + //[Authorize] [HttpGet("logs/{deviceId}")] public async Task GetLogs(int deviceId) { return await _deviceLogic.GetLogs(deviceId); } - [Authorize] + //[Authorize] [HttpPut("Edit/{deviceId}")] public async Task EditDevice([FromBody] Device device, int deviceId) { diff --git a/backend/Api/Controllers/UserController.cs b/backend/Api/Controllers/UserController.cs index 186e1d4..6646186 100644 --- a/backend/Api/Controllers/UserController.cs +++ b/backend/Api/Controllers/UserController.cs @@ -33,14 +33,14 @@ namespace Api.Controllers return await _userLogic.RegisterUser(user); } - [Authorize] + //[Authorize] [HttpPut("Edit/{userId}")] public async Task EditUser([FromBody] User user, int userId) { return await _userLogic.EditProfile(user, userId); } - [Authorize] + //[Authorize] [HttpDelete("Delete/{userId}")] public async Task DeleteUser(int userId) { diff --git a/backend/Api/DBAccess/DBAccess.cs b/backend/Api/DBAccess/DBAccess.cs index 19a46fd..83a4f13 100644 --- a/backend/Api/DBAccess/DBAccess.cs +++ b/backend/Api/DBAccess/DBAccess.cs @@ -150,6 +150,10 @@ namespace Api.DBAccess return await _context.Devices.FirstOrDefaultAsync(d => d.Id == deviceId); } + public Device ReadDevice(string refenreId) + { + return _context.Devices.FirstOrDefault(d => d.ReferenceId == refenreId); + } public async Task UpdateDevice(Device device, int deviceId) { @@ -183,6 +187,18 @@ namespace Api.DBAccess return logs; } + public async void CreateLog(TemperatureLogs temperatureLogs, string referenceId) + { + var device = await _context.Devices.Include(d => d.Logs).FirstOrDefaultAsync(d => d.ReferenceId == referenceId); + + if (device == null) { return; } + + if (device.Logs == null) { device.Logs = new List(); } + + device.Logs.Add(temperatureLogs); + await _context.SaveChangesAsync(); + } + public async Task Test() { return _context.Database.CanConnect(); diff --git a/backend/Api/Program.cs b/backend/Api/Program.cs index 5802836..7376c91 100644 --- a/backend/Api/Program.cs +++ b/backend/Api/Program.cs @@ -1,4 +1,6 @@ using Api; +using Api.DBAccess; +using Api.MQTTReciever; using Microsoft.AspNetCore; using Microsoft.EntityFrameworkCore; @@ -8,6 +10,17 @@ class Program { var app = CreateWebHostBuilder(args).Build(); + + using (var scope = app.Services.CreateScope()) + { + var services = scope.ServiceProvider; + var configuration = services.GetRequiredService(); + var dbAccess = services.GetRequiredService(); + + MQTTReciever mqtt = new MQTTReciever(configuration, dbAccess); + mqtt.Handle_Received_Application_Message(); + } + RunMigrations(app); app.Run();