xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构服务类和仓库类

Browse Source
This commit is contained in:
David P.G
2025-07-19 22:29:50 +08:00
parent 5cf25dd9ac
commit 7faac9aef1
25 changed files with 324 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
DMS.WPF/App.xaml.cs
View File

@@ -22,6 +22,8 @@ using DMS.WPF.Services.Processors;
using DMS.WPF.ViewModels.DMS.WPF.ViewModels;
using SqlSugar;
using LogLevel = Microsoft.Extensions.Logging.LogLevel;
using DMS.Infrastructure.Services;
using DMS.Infrastructure.Interfaces;
namespace DMS;
@@ -31,6 +33,8 @@ namespace DMS;
public partial class App : System.Windows.Application
{
public IServiceProvider Services { get; }
public AppSettings Settings { get; private set; }
public App()
{
@@ -59,11 +63,10 @@ public partial class App : System.Windows.Application
try
{
var databaseInitializer = Host.Services.GetRequiredService<DMS.Infrastructure.Services.DatabaseInitializerService>();
var databaseInitializer = Host.Services.GetRequiredService<DatabaseInitializerService>();
databaseInitializer.InitializeDataBase();
await databaseInitializer.InitializeMenu()
.Await((e) => { NotificationHelper.ShowError($"初始化主菜单失败：{e.Message}", e); },
() => { MessageHelper.SendLoadMessage(LoadTypes.Menu); });
await databaseInitializer.InitializeMenu();
Settings = AppSettings.Load();
Host.Services.GetRequiredService<GrowlNotificationService>();
// 初始化数据处理链
@@ -83,7 +86,7 @@ public partial class App : System.Windows.Application
MainWindow.Show();
// 根据配置启动服务
// var connectionSettings = DMS.Config.ConnectionSettings.Load();
// var connectionSettings = DMS.Config.AppSettings.Load();
// if (connectionSettings.EnableMqttService)
// {
// Host.Services.GetRequiredService<MqttBackgroundService>().StartService();
@@ -105,18 +108,8 @@ public partial class App : System.Windows.Application
private void ConfigureServices(IServiceCollection services)
{
// Register ConnectionSettings
services.AddSingleton(ConnectionSettings.Load());
services.AddTransient<IDbContext,SqlSugarDbContext>();
// Register SqlSugarDbContext (concrete type, used by DatabaseInitializerService)
// SqlSugarDbContext now internally creates SqlSugarClient using ConnectionSettings
services.AddScoped<DMS.Infrastructure.Data.SqlSugarDbContext>();
// Register ITransaction (abstract interface for transaction management)
//services.AddScoped<DMS.Core.Interfaces.ITransaction, DMS.Infrastructure.Data.SqlSugarDbContext>();
//// Register IDatabaseService (abstract interface for database initialization)
//services.AddSingleton<DMS.Core.Interfaces.IDatabaseService, DMS.Infrastructure.Services.DatabaseInitializerService>();
services.AddSingleton<DataServices>();
services.AddSingleton<NavgatorServices>();