hbecher/moniteur-baie
1
0
Fork 0
Code Activity

Initial commit

Browse Source
This commit is contained in:
Hervé BECHER
2023-06-21 13:51:38 +02:00
commit 957670ce42
45 changed files with 1894 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
DataApi/Common/Repositories/BaseMariaDbRepository.cs Normal file
View File

@@ -0,0 +1,19 @@
using MySqlConnector;
namespace MoniteurBaie.DataApi.Common.Repositories;
public class BaseMariaDbRepository
{
private readonly string _connectionString;
protected BaseMariaDbRepository(IConfiguration config, string connectionStringName) : this(config.GetConnectionString(connectionStringName)!) { }
protected BaseMariaDbRepository(string connectionString) => _connectionString = connectionString;
protected async Task<MySqlConnection> NewConnectionAsync()
{
var connection = new MySqlConnection(_connectionString);
await connection.OpenAsync();
return connection;
}
}

59
DataApi/Controllers/DataPacketsController.cs Normal file
View File

@@ -0,0 +1,59 @@
using Microsoft.AspNetCore.Mvc;
using MoniteurBaie.DataApi.Interfaces.Repositories;
using MoniteurBaie.DataModels;
namespace MoniteurBaie.DataApi.Controllers;
[ApiController]
[Route("packets")]
public class DataPacketsController : ControllerBase
{
private readonly ILogger<DataPacketsController> _logger;
private readonly IDataRepository _dataRepository;
public DataPacketsController(ILogger<DataPacketsController> logger, IDataRepository dataRepository)
{
_logger = logger;
_dataRepository = dataRepository;
}
[HttpGet("{id}", Name = "GetDataPacket")]
public async Task<IActionResult> GetAsync(uint id)
{
var packet = await _dataRepository.GetAsync(id);
return packet is null ? NotFound() : Ok(packet);
}
[HttpPost(Name = "CreateDataPacket")]
public async Task<IActionResult> CreateAsync(DataPacket packet)
{
var packetId = await _dataRepository.CreateAsync(packet);
return CreatedAtRoute("GetDataPacket", new { id = packetId }, packet with { Id = packetId });
}
[HttpDelete("{id}", Name = "DeleteDataPacket")]
public async Task<IActionResult> DeleteAsync(uint id)
{
var success = await _dataRepository.DeleteAsync(id);
return success ? NoContent() : NotFound();
}
[HttpGet("last", Name = "GetLastDataPackets")]
public IActionResult GetLastAsync(int count)
{
return Ok(_dataRepository.GetLastAsync(count));
}
[HttpGet("range", Name = "GetRangeDataPackets")]
public IActionResult GetRangeAsync(DateTime fromInstant, DateTime toInstant)
{
return Ok(_dataRepository.GetRangeAsync(fromInstant, toInstant));
}
[HttpPost("bulk", Name = "BulkCreateDataPackets")]
public async Task<IActionResult> BulkCreateAsync(IEnumerable<DataPacket> packets)
{
await _dataRepository.BulkCreateAsync(packets);
return Ok();
}
}

28
DataApi/DataApi.csproj Normal file
View File

@@ -0,0 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>$(SolutionName.Replace(" ", "_")).$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Remove="publish\**" />
<Content Remove="publish\**" />
<EmbeddedResource Remove="publish\**" />
<None Remove="publish\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
<PackageReference Include="MySqlConnector" Version="2.2.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DataModels\DataModels.csproj" />
</ItemGroup>
</Project>

18
DataApi/Interfaces/Repositories/IDataRepository.cs Normal file
View File

@@ -0,0 +1,18 @@
using MoniteurBaie.DataModels;
namespace MoniteurBaie.DataApi.Interfaces.Repositories;
public interface IDataRepository
{
Task<DataPacket?> GetAsync(uint id);
Task<uint> CreateAsync(DataPacket packet);
IAsyncEnumerable<DataPacket> GetRangeAsync(DateTime fromInstant, DateTime toInstant);
IAsyncEnumerable<DataPacket> GetLastAsync(int count);
Task<bool> DeleteAsync(uint id);
Task BulkCreateAsync(IEnumerable<DataPacket> packets);
}

30
DataApi/Program.cs Normal file
View File

@@ -0,0 +1,30 @@
using MoniteurBaie.DataApi.Interfaces.Repositories;
using MoniteurBaie.DataApi.Repositories;
var builder = WebApplication.CreateBuilder(args);
builder.Host.UseSystemd();
// Add services to the container.
builder.Services.AddControllers();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
builder.Services.AddSingleton<IDataRepository, DataRepository>();
var app = builder.Build();
// Configure the HTTP request pipeline.
if (app.Environment.IsDevelopment())
{
app.UseSwagger();
app.UseSwaggerUI();
}
app.UseAuthorization();
app.MapControllers();
app.Run();

22
DataApi/Properties/PublishProfiles/FolderPublish.pubxml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<DeleteExistingFiles>true</DeleteExistingFiles>
<ExcludeApp_Data>false</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<PublishSingleFile>true</PublishSingleFile>
<ProjectGuid>12a93e6e-00cb-4447-b431-64ebfe8ee566</ProjectGuid>
<SelfContained>false</SelfContained>
</PropertyGroup>
</Project>

31
DataApi/Properties/launchSettings.json Normal file
View File

@@ -0,0 +1,31 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:56142",
"sslPort": 0
}
},
"profiles": {
"DataAccess": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5256",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

246
DataApi/Repositories/DataRepository.cs Normal file
View File

@@ -0,0 +1,246 @@
using MoniteurBaie.DataApi.Common.Repositories;
using MoniteurBaie.DataApi.Interfaces.Repositories;
using MoniteurBaie.DataModels;
using MySqlConnector;
namespace MoniteurBaie.DataApi.Repositories;
public class DataRepository : BaseMariaDbRepository, IDataRepository
{
public DataRepository(IConfiguration config) : base(config, "MariaDb")
{
}
private static DataPacket Map(MySqlDataReader reader) => new(
reader.GetUInt32(0),
reader.GetDateTime(1),
reader.GetFloat(2),
reader.GetFloat(3),
reader.GetFloat(4),
reader.GetFloat(5),
reader.GetFloat(6),
reader.GetFloat(7),
reader.GetFloat(8),
reader.GetFloat(9),
reader.GetFloat(10),
reader.GetFloat(11),
reader.GetFloat(12),
reader.GetFloat(13),
reader.GetFloat(14),
reader.GetFloat(15),
reader.GetFloat(16),
reader.GetBoolean(17),
reader.GetBoolean(18),
reader.GetBoolean(19),
reader.GetBoolean(20),
reader.GetBoolean(21),
reader.GetBoolean(22),
reader.GetBoolean(23),
reader.GetBoolean(24),
reader.GetBoolean(25),
reader.GetBoolean(26),
reader.GetBoolean(27),
reader.GetBoolean(28),
reader.GetBoolean(29),
reader.GetBoolean(30),
reader.GetBoolean(31),
reader.GetBoolean(32),
reader.GetBoolean(33),
reader.GetBoolean(34),
reader.GetBoolean(35),
reader.GetUInt32(36),
reader.GetUInt32(37),
reader.GetBoolean(38),
reader.GetBoolean(39),
reader.GetBoolean(40),
reader.GetBoolean(41),
reader.GetBoolean(42));
public async Task<DataPacket?> GetAsync(uint id)
{
await using var connection = await NewConnectionAsync();
await using var command = connection.CreateCommand();
command.CommandText = "SELECT * FROM packets WHERE id = @id";
command.Parameters.AddWithValue("@id", id);
await using var reader = await command.ExecuteReaderAsync();
return await reader.ReadAsync() ? Map(reader) : null;
}
public async IAsyncEnumerable<DataPacket> GetRangeAsync(DateTime fromInstant, DateTime toInstant)
{
await using var connection = await NewConnectionAsync();
await using var command = connection.CreateCommand();
command.CommandText = "SELECT * FROM packets WHERE timestamp BETWEEN @from AND @to ORDER BY timestamp DESC";
command.Parameters.AddWithValue("@from", fromInstant);
command.Parameters.AddWithValue("@to", toInstant);
await using var reader = await command.ExecuteReaderAsync();
while (await reader.ReadAsync())
{
yield return Map(reader);
}
}
public async IAsyncEnumerable<DataPacket> GetLastAsync(int count)
{
await using var connection = await NewConnectionAsync();
await using var command = connection.CreateCommand();
command.CommandText = "SELECT * FROM packets ORDER BY timestamp DESC FETCH FIRST @count ROWS ONLY";
command.Parameters.AddWithValue("@count", count);
await using var reader = await command.ExecuteReaderAsync();
while (await reader.ReadAsync())
{
yield return Map(reader);
}
}
public async Task<uint> CreateAsync(DataPacket packet)
{
await using var connection = await NewConnectionAsync();
await using var command = connection.CreateCommand();
command.CommandText = "INSERT INTO packets (timestamp, vb1, vb2, vb3, vb4, vb5, vb6, vbat, vb_min, vb_max, current, power, energy, temp_alim, temp_cha, temp_bat, df_temp_alim, mem_df_temp_alim, df_temp_bat, mem_df_temp_bat, df_temp_cha, mem_df_temp_cha, df_v_incoherent, df_bad_cell, df_overcurrent, df_overcurrent_stop, df_stop_general, df_general, df_cell_overvoltage, mem_df_cell_overvoltage, df_unbalance, mem_df_unbalance, buzzer_stop, decharge, mem_decharge, compteur_demande_coupure_batterie, compteur_demande_coupure_totale, s_powrelay, s_charelay, s_batrelay1, s_batrelay_state, flag_decharge) VALUES (@timestamp, @vb1, @vb2, @vb3, @vb4, @vb5, @vb6, @vbat, @vb_min, @vb_max, @current, @power, @energy, @temp_alim, @temp_cha, @temp_bat, @df_temp_alim, @mem_df_temp_alim, @df_temp_bat, @mem_df_temp_bat, @df_temp_cha, @mem_df_temp_cha, @df_v_incoherent, @df_bad_cell, @df_overcurrent, @df_overcurrent_stop, @df_stop_general, @df_general, @df_cell_overvoltage, @mem_df_cell_overvoltage, @df_unbalance, @mem_df_unbalance, @buzzer_stop, @decharge, @mem_decharge, @compteur_demande_coupure_batterie, @compteur_demande_coupure_totale, @s_powrelay, @s_charelay, @s_batrelay1, @s_batrelay_state, @flag_decharge)";
command.Parameters.AddWithValue("@timestamp", packet.Timestamp);
command.Parameters.AddWithValue("@vb1", packet.VB1);
command.Parameters.AddWithValue("@vb2", packet.VB2);
command.Parameters.AddWithValue("@vb3", packet.VB3);
command.Parameters.AddWithValue("@vb4", packet.VB4);
command.Parameters.AddWithValue("@vb5", packet.VB5);
command.Parameters.AddWithValue("@vb6", packet.VB6);
command.Parameters.AddWithValue("@vbat", packet.VBat);
command.Parameters.AddWithValue("@vb_min", packet.VBmin);
command.Parameters.AddWithValue("@vb_max", packet.VBmax);
command.Parameters.AddWithValue("@current", packet.Curr);
command.Parameters.AddWithValue("@power", packet.Power);
command.Parameters.AddWithValue("@energy", packet.Energy);
command.Parameters.AddWithValue("@temp_alim", packet.Temp_alim);
command.Parameters.AddWithValue("@temp_cha", packet.Temp_cha);
command.Parameters.AddWithValue("@temp_bat", packet.Temp_bat);
command.Parameters.AddWithValue("@df_temp_alim", packet.DF_TEMP_ALIM);
command.Parameters.AddWithValue("@mem_df_temp_alim", packet.MEM_DF_TEMP_ALIM);
command.Parameters.AddWithValue("@df_temp_bat", packet.DF_TEMP_BAT);
command.Parameters.AddWithValue("@mem_df_temp_bat", packet.MEM_DF_TEMP_BAT);
command.Parameters.AddWithValue("@df_temp_cha", packet.DF_TEMP_CHA);
command.Parameters.AddWithValue("@mem_df_temp_cha", packet.MEM_DF_TEMP_CHA);
command.Parameters.AddWithValue("@df_v_incoherent", packet.DF_V_INCOHERENT);
command.Parameters.AddWithValue("@df_bad_cell", packet.DF_BAD_CELL);
command.Parameters.AddWithValue("@df_overcurrent", packet.DF_OVERCURRENT);
command.Parameters.AddWithValue("@df_overcurrent_stop", packet.DF_OVERCURRENT_STOP);
command.Parameters.AddWithValue("@df_stop_general", packet.DF_STOP_GENERAL);
command.Parameters.AddWithValue("@df_general", packet.DF_GENERAL);
command.Parameters.AddWithValue("@df_cell_overvoltage", packet.DF_CELL_OVERVOLTAGE);
command.Parameters.AddWithValue("@mem_df_cell_overvoltage", packet.MEM_DF_CELL_OVERVOLTAGE);
command.Parameters.AddWithValue("@df_unbalance", packet.DF_UNBALANCE);
command.Parameters.AddWithValue("@mem_df_unbalance", packet.MEM_DF_UNBALANCE);
command.Parameters.AddWithValue("@buzzer_stop", packet.Buzzer_stop);
command.Parameters.AddWithValue("@decharge", packet.DECHARGE);
command.Parameters.AddWithValue("@mem_decharge", packet.MEM_DECHARGE);
command.Parameters.AddWithValue("@compteur_demande_coupure_batterie", packet.Compteur_demande_coupure_batterie);
command.Parameters.AddWithValue("@compteur_demande_coupure_totale", packet.Compteur_demande_coupure_totale);
command.Parameters.AddWithValue("@s_powrelay", packet.S_PowRelay);
command.Parameters.AddWithValue("@s_charelay", packet.S_ChaRelay);
command.Parameters.AddWithValue("@s_batrelay1", packet.S_BatRelay1);
command.Parameters.AddWithValue("@s_batrelay_state", packet.S_BatRelay_State);
command.Parameters.AddWithValue("@flag_decharge", packet.Flag_decharge);
var rowCount = await command.ExecuteNonQueryAsync();
return rowCount > 0 ? (uint)command.LastInsertedId : 0u;
}
public async Task<bool> DeleteAsync(uint id)
{
await using var connection = await NewConnectionAsync();
await using var command = connection.CreateCommand();
command.CommandText = "DELETE FROM packets WHERE id = @id";
command.Parameters.AddWithValue("@id", id);
var result = await command.ExecuteNonQueryAsync();
return result > 0;
}
public async Task BulkCreateAsync(IEnumerable<DataPacket> packets)
{
await using var connection = await NewConnectionAsync();
await using var transaction = await connection.BeginTransactionAsync();
try
{
await using var command = connection.CreateCommand();
command.Transaction = transaction;
command.CommandText = "INSERT INTO packets (timestamp, vb1, vb2, vb3, vb4, vb5, vb6, vbat, vb_min, vb_max, current, power, energy, temp_alim, temp_cha, temp_bat, df_temp_alim, mem_df_temp_alim, df_temp_bat, mem_df_temp_bat, df_temp_cha, mem_df_temp_cha, df_v_incoherent, df_bad_cell, df_overcurrent, df_overcurrent_stop, df_stop_general, df_general, df_cell_overvoltage, mem_df_cell_overvoltage, df_unbalance, mem_df_unbalance, buzzer_stop, decharge, mem_decharge, compteur_demande_coupure_batterie, compteur_demande_coupure_totale, s_powrelay, s_charelay, s_batrelay1, s_batrelay_state, flag_decharge) VALUES (@timestamp, @vb1, @vb2, @vb3, @vb4, @vb5, @vb6, @vbat, @vb_min, @vb_max, @current, @power, @energy, @temp_alim, @temp_cha, @temp_bat, @df_temp_alim, @mem_df_temp_alim, @df_temp_bat, @mem_df_temp_bat, @df_temp_cha, @mem_df_temp_cha, @df_v_incoherent, @df_bad_cell, @df_overcurrent, @df_overcurrent_stop, @df_stop_general, @df_general, @df_cell_overvoltage, @mem_df_cell_overvoltage, @df_unbalance, @mem_df_unbalance, @buzzer_stop, @decharge, @mem_decharge, @compteur_demande_coupure_batterie, @compteur_demande_coupure_totale, @s_powrelay, @s_charelay, @s_batrelay1, @s_batrelay_state, @flag_decharge)";
foreach (var packet in packets)
{
command.Parameters.AddWithValue("@timestamp", packet.Timestamp);
command.Parameters.AddWithValue("@vb1", packet.VB1);
command.Parameters.AddWithValue("@vb2", packet.VB2);
command.Parameters.AddWithValue("@vb3", packet.VB3);
command.Parameters.AddWithValue("@vb4", packet.VB4);
command.Parameters.AddWithValue("@vb5", packet.VB5);
command.Parameters.AddWithValue("@vb6", packet.VB6);
command.Parameters.AddWithValue("@vbat", packet.VBat);
command.Parameters.AddWithValue("@vb_min", packet.VBmin);
command.Parameters.AddWithValue("@vb_max", packet.VBmax);
command.Parameters.AddWithValue("@current", packet.Curr);
command.Parameters.AddWithValue("@power", packet.Power);
command.Parameters.AddWithValue("@energy", packet.Energy);
command.Parameters.AddWithValue("@temp_alim", packet.Temp_alim);
command.Parameters.AddWithValue("@temp_cha", packet.Temp_cha);
command.Parameters.AddWithValue("@temp_bat", packet.Temp_bat);
command.Parameters.AddWithValue("@df_temp_alim", packet.DF_TEMP_ALIM);
command.Parameters.AddWithValue("@mem_df_temp_alim", packet.MEM_DF_TEMP_ALIM);
command.Parameters.AddWithValue("@df_temp_bat", packet.DF_TEMP_BAT);
command.Parameters.AddWithValue("@mem_df_temp_bat", packet.MEM_DF_TEMP_BAT);
command.Parameters.AddWithValue("@df_temp_cha", packet.DF_TEMP_CHA);
command.Parameters.AddWithValue("@mem_df_temp_cha", packet.MEM_DF_TEMP_CHA);
command.Parameters.AddWithValue("@df_v_incoherent", packet.DF_V_INCOHERENT);
command.Parameters.AddWithValue("@df_bad_cell", packet.DF_BAD_CELL);
command.Parameters.AddWithValue("@df_overcurrent", packet.DF_OVERCURRENT);
command.Parameters.AddWithValue("@df_overcurrent_stop", packet.DF_OVERCURRENT_STOP);
command.Parameters.AddWithValue("@df_stop_general", packet.DF_STOP_GENERAL);
command.Parameters.AddWithValue("@df_general", packet.DF_GENERAL);
command.Parameters.AddWithValue("@df_cell_overvoltage", packet.DF_CELL_OVERVOLTAGE);
command.Parameters.AddWithValue("@mem_df_cell_overvoltage", packet.MEM_DF_CELL_OVERVOLTAGE);
command.Parameters.AddWithValue("@df_unbalance", packet.DF_UNBALANCE);
command.Parameters.AddWithValue("@mem_df_unbalance", packet.MEM_DF_UNBALANCE);
command.Parameters.AddWithValue("@buzzer_stop", packet.Buzzer_stop);
command.Parameters.AddWithValue("@decharge", packet.DECHARGE);
command.Parameters.AddWithValue("@mem_decharge", packet.MEM_DECHARGE);
command.Parameters.AddWithValue("@compteur_demande_coupure_batterie", packet.Compteur_demande_coupure_batterie);
command.Parameters.AddWithValue("@compteur_demande_coupure_totale", packet.Compteur_demande_coupure_totale);
command.Parameters.AddWithValue("@s_powrelay", packet.S_PowRelay);
command.Parameters.AddWithValue("@s_charelay", packet.S_ChaRelay);
command.Parameters.AddWithValue("@s_batrelay1", packet.S_BatRelay1);
command.Parameters.AddWithValue("@s_batrelay_state", packet.S_BatRelay_State);
command.Parameters.AddWithValue("@flag_decharge", packet.Flag_decharge);
await command.ExecuteNonQueryAsync();
command.Parameters.Clear();
}
}
catch
{
await transaction.RollbackAsync();
throw;
}
await transaction.CommitAsync();
}
}

8
DataApi/appsettings.Development.json Normal file
View File

@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}

12
DataApi/appsettings.json Normal file
View File

@@ -0,0 +1,12 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"ConnectionStrings": {
"MariaDb": "Server=mercedes.hbsha.re;Port=3306;User=moniteurbaie;Password=M0ñîT€urB@1E;Database=moniteurbaie;Pooling=True;ApplicationName=MoniteurBaie"
}
}