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

添加DataService为数据服务类，负责数据的加载工作，通过消息来通知DataService更新数据

Browse Source
This commit is contained in:
David P.G
2025-06-28 19:32:51 +08:00
parent a04bfc2010
commit dba56f07d2
17 changed files with 181 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
App.xaml.cs
View File

@@ -8,6 +8,7 @@ using NLog.Extensions.Logging;
using PMSWPF.Data;
using PMSWPF.Data.Entities;
using PMSWPF.Data.Repositories;
using PMSWPF.Enums;
using PMSWPF.Services;
using PMSWPF.ViewModels;
using PMSWPF.Views;
@@ -34,8 +35,9 @@ public partial class App : Application
});
container.AddSingleton<DataServices>();
container.AddSingleton<NavgatorServices>();
container.AddSingleton<IDialogService,DialogService>();
container.AddSingleton<IDialogService, DialogService>();
container.AddSingleton<GrowlNotificationService>();
container.AddSingleton<MainViewModel>();
container.AddSingleton<HomeViewModel>();
@@ -72,16 +74,18 @@ public partial class App : Application
using (var db = DbContext.GetInstance())
{
List<DbMenu> items = new List<DbMenu>();
items.Add(new DbMenu() { Name = "主页", Icon = SegoeFluentIcons.Home.Glyph, ParentId = 0});
items.Add(new DbMenu() { Name = "设备", Icon = SegoeFluentIcons.Devices.Glyph, ParentId = 0});
items.Add(new DbMenu() { Name = "数据转换", Icon = SegoeFluentIcons.Move.Glyph, ParentId = 0});
items.Add(new DbMenu() { Name = "设置", Icon = SegoeFluentIcons.Settings.Glyph, ParentId = 0});
items.Add(new DbMenu() { Name = "关于", Icon = SegoeFluentIcons.Info.Glyph, ParentId = 0});
items.Add(new DbMenu()
{ Name = "主页", Type = MenuType.MainMenu, Icon = SegoeFluentIcons.Home.Glyph, ParentId = 0 });
items.Add(new DbMenu()
{ Name = "设备", Type = MenuType.MainMenu, Icon = SegoeFluentIcons.Devices3.Glyph, ParentId = 0 });
items.Add(new DbMenu()
{ Name = "数据转换", Type = MenuType.MainMenu, Icon = SegoeFluentIcons.ChromeSwitch.Glyph, ParentId = 0 });
items.Add(new DbMenu()
{ Name = "设置", Type = MenuType.MainMenu, Icon = SegoeFluentIcons.Settings.Glyph, ParentId = 0 });
items.Add(new DbMenu()
{ Name = "关于", Type = MenuType.MainMenu, Icon = SegoeFluentIcons.Info.Glyph, ParentId = 0 });
db.Insertable<DbMenu>(items).ExecuteCommand();
}
}
private void InitDB()

4
Data/Entities/DbMenu.cs
View File

@@ -1,4 +1,6 @@
using PMSWPF.Enums;
using SqlSugar;
using SqlSugar.DbConvert;
namespace PMSWPF.Data.Entities;
@@ -10,6 +12,8 @@ public class DbMenu
public string Icon { get; set; }
public string Name { get; set; }
public int ParentId { get; set; }
[SugarColumn(ColumnDataType = "varchar(20)", SqlParameterDbType = typeof(EnumToStringConvert))]
public MenuType Type { get; set; }
[SugarColumn(IsIgnore = true)]
public List<DbMenu> Items { get; set; }

2
Data/Repositories/MenuRepository.cs
View File

@@ -63,12 +63,14 @@ public class MenuRepository
{
Name = "默认变量表",
Icon = SegoeFluentIcons.Tablet.Glyph,
Type = MenuType.VariableTableMenu,
ParentId = addDM.Id,
};
var addVarTable=new MenuBean()
{
Name = "添加变量表",
Icon = SegoeFluentIcons.Add.Glyph,
Type = MenuType.AddVariableTableMenu,
ParentId = addDM.Id,
};
var defTableRes = await _db.Insertable<DbMenu>(defVarTable).ExecuteCommandAsync();

8
Enums/LoadTypes.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace PMSWPF.Enums;
public enum LoadTypes
{
Devices,
Menu,
Mqtt
}

9
Enums/MenuType.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace PMSWPF.Enums;
public enum MenuType
{
MainMenu,
DeviceMenu,
VariableTableMenu,
AddVariableTableMenu,
}

12
Extensions/TaskExtensions.cs
View File

@@ -14,4 +14,16 @@ public static class TaskExtensions
onError?.Invoke(e);
}
}
public static async Task Await<T>(this Task<T> task, Action<Exception> onError = null, Action<T> onComplete = null)
{
try
{
T res= await task;
onComplete?.Invoke(res);
}
catch (Exception e)
{
onError?.Invoke(e);
}
}
}

11
Message/LoadMessage.cs Normal file
View File

@@ -0,0 +1,11 @@
using CommunityToolkit.Mvvm.Messaging.Messages;
using PMSWPF.Enums;
namespace PMSWPF.Message;
public class LoadMessage:ValueChangedMessage<LoadTypes>
{
public LoadMessage(LoadTypes types) : base(types)
{
}
}

4
Message/NavgatorMessage.cs
View File

@@ -5,7 +5,9 @@ namespace PMSWPF.Message;
public class NavgatorMessage : ValueChangedMessage<ViewModelBase>
{
public NavgatorMessage(ViewModelBase value) : base(value)
public Object Parameters;
public NavgatorMessage(ViewModelBase value,Object parameters=null) : base(value)
{
Parameters=parameters;
}
}

4
Models/MenuBean.cs
View File

@@ -1,3 +1,5 @@
using PMSWPF.Enums;
namespace PMSWPF.Models;
public class MenuBean
@@ -7,5 +9,7 @@ public class MenuBean
public string Icon { get; set; }
public string Name { get; set; }
public int ParentId { get; set; }
public MenuType Type { get; set; }
public List<MenuBean> Items { get; set; }
}

76
Services/DataServices.cs Normal file
View File

@@ -0,0 +1,76 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Messaging;
using Microsoft.Extensions.Logging;
using PMSWPF.Data.Repositories;
using PMSWPF.Enums;
using PMSWPF.Extensions;
using PMSWPF.Helper;
using PMSWPF.Message;
using PMSWPF.Models;
namespace PMSWPF.Services;
public partial class DataServices:ObservableRecipient,IRecipient<LoadMessage>
{
private readonly ILogger<DataServices> _logger;
[ObservableProperty]
private List<Device> _devices = new List<Device>();
[ObservableProperty]
private List<MenuBean> menuBeans = new List<MenuBean>();
private readonly DeviceRepository _deviceRepository;
private readonly MenuRepository _menuRepository;
public event Action<List<Device>> OnDeviceListChanged;
public event Action<List<MenuBean>> OnMenuListChanged;
partial void OnDevicesChanged(List<Device> devices)
{
OnDeviceListChanged?.Invoke(devices);
}
partial void OnMenuBeansChanged(List<MenuBean> menuBeans)
{
OnMenuListChanged?.Invoke(menuBeans);
}
public DataServices(ILogger<DataServices> logger )
{
_logger = logger;
IsActive = true;
_deviceRepository = new DeviceRepository();
_menuRepository = new MenuRepository();
}
public async void Receive(LoadMessage message)
{
if (!(message.Value is LoadTypes))
throw new ArgumentException($"接受到的加载类型错误：{message.Value}");
try
{
switch ((LoadTypes)message.Value )
{
case LoadTypes.Devices:
Devices= await _deviceRepository.GetAll();
break;
case LoadTypes.Menu:
MenuBeans= await _menuRepository.GetMenu();
break;
}
}
catch (Exception e)
{
NotificationHelper.ShowMessage($"加载数据出现了错误：{e.Message}");
_logger.LogError($"加载数据出现了错误：{e.Message}");
}
}
}

1
Services/NavgatorServices.cs
View File

@@ -29,6 +29,7 @@ public class NavgatorServices : ObservableRecipient, IRecipient<NavgatorMessage>
public void Receive(NavgatorMessage message)
{
CurrentViewModel = message.Value;
CurrentViewModel.NavgateParameters = message.Parameters;
}
public event Action OnViewModelChanged;

10
ViewModels/DevicesViewModel.cs
View File

@@ -19,24 +19,27 @@ public partial class DevicesViewModel : ViewModelBase
private readonly DeviceRepository _deviceRepository;
private readonly ILogger<DevicesViewModel> _logger;
private readonly IDialogService _dialogService;
private readonly DataServices _dataServices;
[ObservableProperty] private ObservableCollection<Device> _devices;
private readonly MenuRepository _menuRepository;
public DevicesViewModel(
ILogger<DevicesViewModel> logger, IDialogService dialogService
ILogger<DevicesViewModel> logger, IDialogService dialogService, DataServices dataServices
)
{
_deviceRepository = new DeviceRepository();
_menuRepository = new MenuRepository();
_logger = logger;
_dialogService = dialogService;
_dataServices = dataServices;
WeakReferenceMessenger.Default.Send<LoadMessage>(new LoadMessage(LoadTypes.Devices));
_dataServices.OnDeviceListChanged += (devices) => { Devices = new ObservableCollection<Device>(devices); };
}
public async Task OnLoadedAsync()
{
var ds = await _deviceRepository.GetAll();
Devices = new ObservableCollection<Device>(ds);
}
[RelayCommand]
@@ -56,6 +59,7 @@ public partial class DevicesViewModel : ViewModelBase
MenuBean deviceMenu = new MenuBean()
{
Name = device.Name,
Type = MenuType.DeviceMenu,
Icon = SegoeFluentIcons.Devices4.Glyph,
};
bool addMenuRes = await _menuRepository.AddDeviceMenu(deviceMenu);

36
ViewModels/MainViewModel.cs
View File

@@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
using PMSWPF.Data.Entities;
using PMSWPF.Data.Repositories;
using PMSWPF.Enums;
using PMSWPF.Message;
using PMSWPF.Models;
using PMSWPF.Services;
@@ -13,6 +14,7 @@ namespace PMSWPF.ViewModels;
public partial class MainViewModel : ViewModelBase
{
private readonly NavgatorServices _navgatorServices;
private readonly DataServices _dataServices;
[ObservableProperty] private ViewModelBase currentViewModel;
[ObservableProperty]
@@ -20,32 +22,26 @@ public partial class MainViewModel : ViewModelBase
private readonly MenuRepository _menuRepository;
public MainViewModel(NavgatorServices navgatorServices)
public MainViewModel(NavgatorServices navgatorServices,DataServices dataServices)
{
_navgatorServices = navgatorServices;
_menuRepository = new MenuRepository();
_dataServices = dataServices;
_navgatorServices.OnViewModelChanged += () => { CurrentViewModel = _navgatorServices.CurrentViewModel; };
CurrentViewModel = new HomeViewModel();
CurrentViewModel.OnLoaded();
WeakReferenceMessenger.Default.Register<UpdateMenuMessage>( this,UpdateMenu);
WeakReferenceMessenger.Default.Send<LoadMessage>(new LoadMessage(LoadTypes.Menu));
dataServices.OnMenuListChanged += (menus) =>
{
Menus = new ObservableCollection<MenuBean>(menus);
};
}
public override void OnLoaded()
{
}
private async void UpdateMenu(object recipient, UpdateMenuMessage message)
{
await LoadMenu();
}
public override async void OnLoaded()
{
await LoadMenu();
}
private async Task LoadMenu()
{
var menuList= await _menuRepository.GetMenu();
Menus=new ObservableCollection<MenuBean>(menuList);
}
}

1
ViewModels/ViewModelBase.cs
View File

@@ -4,5 +4,6 @@ namespace PMSWPF.ViewModels;
public abstract class ViewModelBase : ObservableObject
{
public Object NavgateParameters { get; set; }
public abstract void OnLoaded();
}

1
Views/MainView.xaml
View File

@@ -41,6 +41,7 @@
MenuItemsSource="{Binding Menus}"
MenuItemTemplate="{StaticResource NavigationViewMenuItem}"
ItemInvoked="NavigationView_OnItemInvoked"
SelectionChanged="NavigationView_OnSelectionChanged"
>
<!-- <ui:NavigationView.MenuItems> -->

11
Views/MainView.xaml.cs
View File

@@ -1,9 +1,11 @@
using System.Windows;
using System.Windows.Controls;
using CommunityToolkit.Mvvm.Messaging;
using iNKORE.UI.WPF.Modern.Controls;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PMSWPF.Message;
using PMSWPF.Models;
using PMSWPF.ViewModels;
namespace PMSWPF.Views;
@@ -69,6 +71,7 @@ public partial class MainView : Window
private void NavigationView_OnItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args)
{
ViewModelBase navgateVM = App.Current.Services.GetRequiredService<HomeViewModel>();
Object parameter =null;
switch (args.InvokedItem)
{
case "主页":
@@ -93,7 +96,13 @@ public partial class MainView : Window
break;
}
var nm = new NavgatorMessage(navgateVM);
var nm = new NavgatorMessage(navgateVM,parameter);
WeakReferenceMessenger.Default.Send(nm);
}
private void NavigationView_OnSelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
{
var selectMenu= args.SelectedItem as MenuBean;
}
}

3
Views/VariableTableView.xaml
View File

@@ -17,6 +17,9 @@
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="10">
<TextBlock Text="所属设备:" /> <TextBlock Text="默认变量表" />
</ikw:SimpleStackPanel>
<DataGrid>
</DataGrid>
</ikw:SimpleStackPanel>