Egalware/mapo-mono
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refresh

Browse Source
This commit is contained in:
Samuele Locatelli
2022-10-03 14:48:49 +02:00
parent 6bf82f6615
commit 661734d1df
21 changed files with 1644 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2210.308</Version>
<Version>1.2.2210.314</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.ANALYZER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2210.308</h4>
<h4>Version: 1.2.2210.314</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2210.308
1.2.2210.314
MP.MONO.ANALYZER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2210.308</version>
<version>1.2.2210.314</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.DECODER/MP.MONO.DECODER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2210.308</Version>
<Version>1.2.2210.314</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2210.308</h4>
<h4>Version: 1.2.2210.314</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2210.308
1.2.2210.314
MP.MONO.DECODER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2210.308</version>
<version>1.2.2210.314</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.Designer.cs
Generated
+1584
View File
File diff suppressed because it is too large Load Diff
MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.cs
+26
View File
@@ -0,0 +1,26 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MP.MONO.Data.Migrations
{
public partial class UpdateDatalogModel : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "DataType",
table: "DataLog",
type: "int",
nullable: false,
defaultValue: 1);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "DataType",
table: "DataLog");
}
}
}
MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs
+3
View File
@@ -227,6 +227,9 @@ namespace MP.MONO.Data.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("DataType")
.HasColumnType("int");
b.Property<DateTime>("DtRif")
.HasColumnType("datetime(6)");
MP.MONO.SIM/MP.MONO.SIM.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2210.308</Version>
<Version>1.2.2210.314</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.SIM/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2210.308</h4>
<h4>Version: 1.2.2210.314</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2210.308
1.2.2210.314
MP.MONO.SIM/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2210.308</version>
<version>1.2.2210.314</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.UI/Components/ParamPlot.razor.cs
+2 -1
View File
@@ -2,6 +2,7 @@
using MP.MONO.Data;
using MP.MONO.Data.DTO;
using MP.MONO.UI.Data;
using static MP.MONO.Core.Enums;
namespace MP.MONO.UI.Components
{
@@ -118,7 +119,7 @@ namespace MP.MONO.UI.Components
isLoading = true;
ListRecords = null;
await Task.Delay(1);
ListRecords = await MMDataService.DataLogDtoGetFilt(MachineId, SelectedParam, StartDate, EndDate);
ListRecords = await MMDataService.DataLogDtoGetFilt(MachineId, DataLogType.Parameter, SelectedParam, StartDate, EndDate);
await Task.Delay(1);
// converto in plotdata
LevelVal = ListRecords.Select(l => new chartJsData.chartJsTSerie() { x = l.DtRif, y = l.ValNum }).ToList();
MP.MONO.UI/Data/CurrentDataService.cs
+13 -4
View File
@@ -268,11 +268,20 @@ namespace MP.MONO.UI.Data
Log.Info($"DataLogGetFilt | {machineId} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb");
return dbResult;
}
public async Task<List<DataLogDTO>> DataLogDtoGetFilt(int machineId, string fluxType, DateTime inizio, DateTime fine)
/// <summary>
/// TimeSearie in formato DataLogDTO
/// </summary>
/// <param name="machineId">ID macchina</param>
/// <param name="dataType">Tipologia di dato richiesto da enum</param>
/// <param name="fluxType">Tipo di Flusso</param>
/// <param name="inizio">DT Inizio estrazione</param>
/// <param name="fine">DT Fine estrazione</param>
/// <returns></returns>
public async Task<List<DataLogDTO>> DataLogDtoGetFilt(int machineId, DataLogType dataType, string fluxType, DateTime inizio, DateTime fine)
{
string source = "DB";
List<DataLogDTO> dbResult = new List<DataLogDTO>();
string currKey = $"{Constants.DATA_LOG_DTO_KEY}:{machineId}:{fluxType.Replace(" ", "_")}:{inizio:yyyyMMdd}:{fine:yyyyMMdd}";
string currKey = $"{Constants.DATA_LOG_DTO_KEY}:{machineId}:{dataType}:{fluxType.Replace(" ", "_")}:{inizio:yyyyMMdd}:{fine:yyyyMMdd}";
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string rawData = await redisDb.StringGetAsync(currKey);
@@ -291,14 +300,14 @@ namespace MP.MONO.UI.Data
}
else
{
dbResult = dbController.DataLogDtoGetFilt(machineId, fluxType, inizio, fine);
dbResult = dbController.DataLogDtoGetFilt(machineId, dataType, fluxType, inizio, fine);
// salvo per 2 min...
rawData = JsonConvert.SerializeObject(dbResult);
await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromSeconds(120));
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Info($"DataLogDtoGetFilt | {machineId} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb");
Log.Info($"DataLogDtoGetFilt | {machineId} | {dataType} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb");
return dbResult;
}
MP.MONO.UI/MP.MONO.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2210.312</Version>
<Version>1.2.2210.314</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2210.312</h4>
<h4>Version: 1.2.2210.314</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2210.312
1.2.2210.314
MP.MONO.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2210.312</version>
<version>1.2.2210.314</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>