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

Merge branch 'Release/MigrateMongoCall_02'

Browse Source
This commit is contained in:
Samuele Locatelli
2026-04-24 09:58:23 +02:00
parent 36645d162a 3c1fdb92a2
commit f421c00593
9 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/DataServiceCollectionExtensions.cs
+2
View File
@@ -1,5 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using MP.Data.Controllers;
using MP.Data.Repository.Mtc;
using MP.Data.Repository.Utils;
using MP.Data.Services.Mtc;
@@ -29,6 +30,7 @@ namespace MP.Data
// Servizi Singleton
services.TryAddSingleton<IMtcSetupService, MtcSetupService>();
services.TryAddSingleton<MpIocController>();
// Servizi Scoped
services.TryAddScoped<IStatsAggrService, StatsAggrService>();
MP.IOC/Controllers/IOBController.cs
+2 -2
View File
@@ -1212,7 +1212,7 @@ namespace MP.IOC.Controllers
string answ = "-1";
DateTime dataOraEvento = DateTime.Now;
Log.Info($"Salvataggio counter | id: {id} | pzCount: {counter}");
Log.Debug($"Salvataggio counter | id: {id} | pzCount: {counter}");
try
{
answ = await DService.saveCounterAsync(id, counter);
@@ -1595,7 +1595,7 @@ namespace MP.IOC.Controllers
innovazioni.Add(trovato);
}
// faccio upsert innovations!
DService.UpsertCurrObjItemsAsync(idxMacc, innovazioni);
await DService.UpsertCurrObjItemsAsync(idxMacc, innovazioni);
Log.Info($"processFLogJsonAsync | {idxMacc} | Updated {innovazioni.Count} par");
}
catch (Exception exc)
MP.IOC/Data/MpDataService.cs
+20 -14
View File
@@ -7,7 +7,6 @@ using MP.Data.Controllers;
using MP.Data.DbModels;
using MP.Data.DbModels.Anag;
using MP.Data.MgModels;
using MP.Data.Repository.Mtc;
using MP.Data.Services.Mtc;
using Newtonsoft.Json;
using NLog;
@@ -27,7 +26,6 @@ namespace MP.IOC.Data
IConfiguration configuration,
ILogger<MpDataService> logger,
IServiceScopeFactory scopeFactory,
IMtcSetupRepository mtcRepo,
IMtcSetupService mtcServ)
{
_logger = logger;
@@ -59,12 +57,11 @@ namespace MP.IOC.Data
}
else
{
SpecDbController = new MP.Data.Controllers.MpSpecController(configuration);
IocDbController = new MP.Data.Controllers.MpIocController(configuration);
SpecDbController = new MpSpecController(configuration);
IocDbController = new MpIocController(configuration);
_logger.LogInformation("DbControllers INIT OK");
}
MtcRepo = mtcRepo;
MtcService = mtcServ;
// conf mongo...
@@ -75,7 +72,7 @@ namespace MP.IOC.Data
}
else
{
mongoController = new MP.Data.Controllers.MpMongoController(configuration);
mongoController = new MpMongoController(configuration);
_logger.LogInformation("MongoController INIT OK");
}
}
@@ -84,11 +81,10 @@ namespace MP.IOC.Data
#region Public Properties
public static MP.Data.Controllers.MpIocController IocDbController { get; set; } = null!;
public static MP.Data.Controllers.MpMongoController mongoController { get; set; } = null!;
public static MP.Data.Controllers.MpSpecController SpecDbController { get; set; } = null!;
private static MP.Data.Services.Mtc.IMtcSetupService MtcService = null!;
private static MP.Data.Repository.Mtc.IMtcSetupRepository MtcRepo;
public static MpIocController IocDbController { get; set; } = null!;
public static MpMongoController mongoController { get; set; } = null!;
public static MpSpecController SpecDbController { get; set; } = null!;
private static IMtcSetupService MtcService = null!;
public MessagePipe BroadastMsgPipe { get; set; } = null!;
/// <summary>
@@ -1918,7 +1914,17 @@ namespace MP.IOC.Data
}
else
{
result = await IocDbController.Macchine2SlaveAsync();
if (useFactory)
{
await using var scope = _scopeFactory.CreateAsyncScope();
var mtcService = scope.ServiceProvider.GetRequiredService<MpIocController>();
result = await mtcService.Macchine2SlaveAsync();
}
else
{
result = await IocDbController.Macchine2SlaveAsync();
}
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
await redisDb.StringSetAsync(currKey, rawData, getRandTOut(redisLongTimeCache * 10));
@@ -2197,13 +2203,13 @@ namespace MP.IOC.Data
{
// lo ri-aggiungo x non perderlo
innovations.Add(item);
Log.Trace($"innovations | add | item.uid: {item.uid} | item.value: {item.value}");
Log.Info($"innovations | add | item.uid: {item.uid} | item.value: {item.value}");
}
// altrimenti aggiorno campo (non trasmesso) name e tengo il resto...
else
{
trovato.name = item.name;
Log.Info($"innovations | update | item.uid: {item.uid} | item.value: {item.value} --> {trovato.value} ");
Log.Debug($"innovations | update | item.uid: {item.uid} | item.value: {item.value} --> {trovato.value} ");
}
}
// serializzo e salvo
MP.IOC/MP.IOC.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>6.16.2604.2407</Version>
<Version>6.16.2604.2409</Version>
</PropertyGroup>
<ItemGroup>
MP.IOC/Program.cs
+3 -3
View File
@@ -28,8 +28,8 @@ logger.Info($"Current ASPNETCORE_ENVIRONMENT: {env.EnvironmentName}");
ConfigurationManager configuration = builder.Configuration;
// REDIS setup
logger.Info("Config OK");
string connStringRedis = configuration.GetConnectionString("Redis");
string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"));
string confRedis = configuration.GetConnectionString("Redis");
string redisSrvAddr = confRedis.Substring(0, confRedis.IndexOf(":"));
logger.Info("Setup REDIS OK");
@@ -100,7 +100,7 @@ builder.Services.AddSwaggerGen(c =>
});
// avvio oggetto shared x redis...
var redisMux = ConnectionMultiplexer.Connect(connStringRedis);
var redisMux = ConnectionMultiplexer.Connect(confRedis);
builder.Services.AddSingleton<IConnectionMultiplexer>(redisMux);
// oggetto principale accesso dati
MP.IOC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MP-IOC </i>
<h4>Versione: 6.16.2604.2407</h4>
<h4>Versione: 6.16.2604.2409</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.IOC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2604.2407
6.16.2604.2409
MP.IOC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2604.2407</version>
<version>6.16.2604.2409</version>
<url>https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/MP.IOC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.IOC/appsettings.Production.json
+3
View File
@@ -32,6 +32,9 @@
"RedisAdmin": "localhost:6379,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true",
"mdbConnString": "mongodb://localhost:27017"
},
"ServerConf": {
"useFactory": false
},
"RedisScripts": {
"Scripts": {
"Update": "RedisScript/RedisUpdateScript_v5.lua"