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-09-07 20:35:40 +08:00
parent 3489f8a064
commit af1b67d0a1
8 changed files with 324 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,7 +277,9 @@ public partial class App : System.Windows.Application
provider.GetRequiredService<IMapper>(),
provider.GetRequiredService<INlogAppService>(),
provider.GetRequiredService<IDialogService>(),
provider.GetRequiredService<INotificationService>()
provider.GetRequiredService<INotificationService>(),
provider.GetRequiredService<DataServices>(),
provider.GetRequiredService<IDataCenterService>()
)
);
services.AddScoped<MqttServerDetailViewModel>();

45
DMS.WPF/Services/DataServices.cs
View File

@@ -12,6 +12,7 @@ using DMS.Core.Models;
using DMS.Message;
using DMS.WPF.ViewModels.Items;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using ObservableCollections;
namespace DMS.WPF.Services;
@@ -50,6 +51,10 @@ public partial class DataServices : ObservableObject, IRecipient<LoadMessage>, I
[ObservableProperty]
private ObservableCollection<MqttServerItemViewModel> _mqttServers;
// 日志列表。
[ObservableProperty]
private ObservableCollection<NlogItemViewModel> _nlogs;
// 设备列表变更事件，当设备列表数据更新时触发。
public event Action<List<Device>> OnDeviceListChanged;
@@ -79,6 +84,37 @@ public partial class DataServices : ObservableObject, IRecipient<LoadMessage>, I
}));
}
/// <summary>
/// 处理日志变更事件
/// </summary>
private void OnNlogChanged(object sender, NlogChangedEventArgs e)
{
// 在UI线程上更新日志
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
switch (e.ChangeType)
{
case DataChangeType.Added:
Nlogs.Add(_mapper.Map<NlogItemViewModel>(e.Nlog));
break;
case DataChangeType.Updated:
var existingLog = Nlogs.FirstOrDefault(l => l.Id == e.Nlog.Id);
if (existingLog != null)
{
_mapper.Map(e.Nlog, existingLog);
}
break;
case DataChangeType.Deleted:
var logToRemove = Nlogs.FirstOrDefault(l => l.Id == e.Nlog.Id);
if (logToRemove != null)
{
Nlogs.Remove(logToRemove);
}
break;
}
}));
}
/// <summary>
/// DataServices类的构造函数。
@@ -98,10 +134,13 @@ public partial class DataServices : ObservableObject, IRecipient<LoadMessage>, I
Menus = new ObservableCollection<MenuItemViewModel>();
MenuTrees = new ObservableCollection<MenuItemViewModel>();
MqttServers = new ObservableCollection<MqttServerItemViewModel>();
Nlogs = new ObservableCollection<NlogItemViewModel>();
// 监听变量值变更事件
_dataCenterService.VariableValueChanged += OnVariableValueChanged;
_dataCenterService.OnLoadDataCompleted += OnLoadDataCompleted;
// 监听日志变更事件
_dataCenterService.NlogChanged += OnNlogChanged;
// 注册消息接收
// WeakReferenceMessenger.Register<LoadMessage>(this, (r, m) => r.Receive(m));
@@ -144,6 +183,9 @@ public partial class DataServices : ObservableObject, IRecipient<LoadMessage>, I
// 加载MQTT服务器数据
MqttServers = _mapper.Map<ObservableCollection<MqttServerItemViewModel>>(_dataCenterService.MqttServers.Values);
// 加载日志数据
Nlogs = _mapper.Map<ObservableCollection<NlogItemViewModel>>(_dataCenterService.Nlogs.Values);
BuildMenuTrees();
}
@@ -477,6 +519,9 @@ public partial class DataServices : ObservableObject, IRecipient<LoadMessage>, I
case LoadTypes.Mqtts:
_ = Task.Run(async () => await LoadMqttServers(_mqttAppService));
break;
case LoadTypes.Logs:
// 日志数据已在IDataCenterService中处理
break;
case LoadTypes.All:
// 加载所有数据
LoadAllDatas();

5
DMS.WPF/ViewModels/Items/NlogItemViewModel.cs
View File

@@ -7,6 +7,11 @@ public class NlogItemViewModel : ObservableObject
{
private Nlog _nlog;
public NlogItemViewModel()
{
_nlog = new Nlog();
}
public NlogItemViewModel(Nlog nlog)
{
_nlog = nlog;

86
DMS.WPF/ViewModels/LogHistoryViewModel.cs
View File

@@ -15,15 +15,19 @@ using DMS.WPF.ViewModels.Dialogs;
using Microsoft.Extensions.DependencyInjection;
using System.Collections.ObjectModel;
using System;
using DMS.WPF.Services;
using DMS.Application.DTOs.Events;
namespace DMS.WPF.ViewModels;
partial class LogHistoryViewModel : ViewModelBase
partial class LogHistoryViewModel : ViewModelBase,IDisposable
{
public DataServices DataServices { get; }
private readonly IMapper _mapper;
private readonly INlogAppService _nlogAppService;
private readonly IDialogService _dialogService;
private readonly INotificationService _notificationService;
private readonly IDataCenterService _dataCenterService;
[ObservableProperty]
private NlogItemViewModel _selectedLog;
@@ -43,16 +47,85 @@ partial class LogHistoryViewModel : ViewModelBase
public ObservableCollection<string> LogLevels { get; } = new ObservableCollection<string> { "Trace", "Debug", "Info", "Warn", "Error", "Fatal" };
public LogHistoryViewModel(IMapper mapper, INlogAppService nlogAppService, IDialogService dialogService, INotificationService notificationService)
public LogHistoryViewModel(IMapper mapper, INlogAppService nlogAppService, IDialogService dialogService,
INotificationService notificationService, DataServices dataServices, IDataCenterService dataCenterService)
{
_mapper = mapper;
_nlogAppService = nlogAppService;
_dialogService = dialogService;
_notificationService = notificationService;
DataServices = dataServices;
_dataCenterService = dataCenterService;
_logItemList = new ObservableList<NlogItemViewModel>();
_logItemList = new ObservableList<NlogItemViewModel>(DataServices.Nlogs);
_synchronizedView = _logItemList.CreateView(v => v);
LogItemListView = _synchronizedView.ToNotifyCollectionChanged();
// 订阅日志变更事件
_dataCenterService.NlogChanged += OnNlogChanged;
}
/// <summary>
/// 处理日志变更事件
/// </summary>
private void OnNlogChanged(object sender, NlogChangedEventArgs e)
{
// 在UI线程上更新日志
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
switch (e.ChangeType)
{
case DataChangeType.Added:
var newLogItem = new NlogItemViewModel(new Nlog
{
Id = e.Nlog.Id,
LogTime = e.Nlog.LogTime,
Level = e.Nlog.Level,
ThreadId = e.Nlog.ThreadId,
ThreadName = e.Nlog.ThreadName,
Callsite = e.Nlog.Callsite,
CallsiteLineNumber = e.Nlog.CallsiteLineNumber,
Message = e.Nlog.Message,
Logger = e.Nlog.Logger,
Exception = e.Nlog.Exception,
CallerFilePath = e.Nlog.CallerFilePath,
CallerLineNumber = e.Nlog.CallerLineNumber,
CallerMember = e.Nlog.CallerMember
});
_logItemList.Add(newLogItem);
break;
case DataChangeType.Updated:
var existingLog = _logItemList.FirstOrDefault(l => l.Id == e.Nlog.Id);
if (existingLog != null)
{
existingLog = new NlogItemViewModel(new Nlog
{
Id = e.Nlog.Id,
LogTime = e.Nlog.LogTime,
Level = e.Nlog.Level,
ThreadId = e.Nlog.ThreadId,
ThreadName = e.Nlog.ThreadName,
Callsite = e.Nlog.Callsite,
CallsiteLineNumber = e.Nlog.CallsiteLineNumber,
Message = e.Nlog.Message,
Logger = e.Nlog.Logger,
Exception = e.Nlog.Exception,
CallerFilePath = e.Nlog.CallerFilePath,
CallerLineNumber = e.Nlog.CallerLineNumber,
CallerMember = e.Nlog.CallerMember
});
}
break;
case DataChangeType.Deleted:
var logToRemove = _logItemList.FirstOrDefault(l => l.Id == e.Nlog.Id);
if (logToRemove != null)
{
_logItemList.Remove(logToRemove);
}
break;
}
}));
}
private bool FilterLogs(NlogItemViewModel item)
@@ -165,4 +238,11 @@ partial class LogHistoryViewModel : ViewModelBase
_notificationService.ShowError($"加载日志时发生错误: {ex.Message}", ex);
}
}
public void Dispose()
{
// 取消订阅事件
_dataCenterService.NlogChanged -= OnNlogChanged;
}
}