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

refactor:完成重构设备的添加，删除，更新。

Browse Source
This commit is contained in:
David P.G
2025-10-22 14:06:16 +08:00
parent e995ec7207
commit 54d040b45f
76 changed files with 1028 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
DMS.WPF/Services/TriggerDataService.cs
View File

@@ -25,8 +25,8 @@ public class TriggerDataService : ITriggerDataService
private readonly IMapper _mapper;
private readonly IAppCenterService _appCenterService;
private readonly IMenuViewService _menuDataService;
private readonly IAppStorageService _appStorageService;
private readonly IWpfDataService _dataStorageService;
private readonly IAppDataService _appDataService;
private readonly IViewDataService _viewDataService;
private readonly IEventService _eventService;
private readonly INotificationService _notificationService;
private readonly Dispatcher _uiDispatcher;
@@ -42,14 +42,14 @@ public class TriggerDataService : ITriggerDataService
/// <param name="notificationService">通知服务实例。</param>
public TriggerDataService(IMapper mapper, IAppCenterService appCenterService,
IMenuViewService menuDataService,
IAppStorageService appStorageService, IWpfDataService dataStorageService,
IAppDataService appStorageService, IViewDataService dataStorageService,
IEventService eventService, INotificationService notificationService)
{
_mapper = mapper;
_appCenterService = appCenterService;
_menuDataService = menuDataService;
_appStorageService = appStorageService;
_dataStorageService = dataStorageService;
_appDataService = appStorageService;
_viewDataService = dataStorageService;
_eventService = eventService;
_notificationService = notificationService;
_uiDispatcher = Dispatcher.CurrentDispatcher;
@@ -60,20 +60,20 @@ public class TriggerDataService : ITriggerDataService
/// </summary>
public void LoadAllTriggers()
{
_dataStorageService.Triggers.Clear();
foreach (var trigger in _appStorageService.Triggers.Values)
_viewDataService.Triggers.Clear();
foreach (var trigger in _appDataService.Triggers.Values)
{
TriggerItem triggerItem = _mapper.Map<TriggerItem>(trigger);
foreach (var variable in trigger.Variables)
{
if (_dataStorageService.Variables.TryGetValue(variable.Id,out var variableItem))
if (_viewDataService.Variables.TryGetValue(variable.Id,out var variableItem))
{
variableItem.Triggers.Add(triggerItem);
triggerItem.Variables.Add(variableItem);
}
}
_dataStorageService.Triggers.Add(trigger.Id, triggerItem);
_viewDataService.Triggers.Add(trigger.Id, triggerItem);
}
}
@@ -95,11 +95,11 @@ public class TriggerDataService : ITriggerDataService
// 给界面添加触发器
var addItem = _mapper.Map(addDto, triggerItem);
_dataStorageService.Triggers.Add(triggerItem.Id, triggerItem);
_viewDataService.Triggers.Add(triggerItem.Id, triggerItem);
//添加菜单
var parentMenu=_dataStorageService.Menus.FirstOrDefault(m => m.TargetViewKey == nameof(TriggersViewModel) && m.TargetId == 0);
var parentMenu=_viewDataService.Menus.FirstOrDefault(m => m.TargetViewKey == nameof(TriggersViewModel) && m.TargetId == 0);
if (parentMenu is not null)
{
var menuItem = new ItemViewModel.MenuItem()
@@ -129,14 +129,14 @@ public class TriggerDataService : ITriggerDataService
if (await _appCenterService.TriggerManagementService.DeleteTriggerAsync(trigger.Id))
{
//删除菜单
var menu=_dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.TriggerMenu && m.TargetId == trigger.Id);
var menu=_viewDataService.Menus.FirstOrDefault(m => m.MenuType == MenuType.TriggerMenu && m.TargetId == trigger.Id);
if (menu is not null)
{
await _menuDataService.DeleteMenuItem(menu);
_menuDataService.DeleteMenuToView(menu);
}
// 从界面删除触发器
_dataStorageService.Triggers.Remove(trigger.Id);
_viewDataService.Triggers.Remove(trigger.Id);
return true;
}
@@ -162,7 +162,7 @@ public class TriggerDataService : ITriggerDataService
// 添加到UI数据存储
var addItem = _mapper.Map<TriggerItem>(createdTrigger.Trigger);
_dataStorageService.Triggers.Add(addItem.Id, addItem);
_viewDataService.Triggers.Add(addItem.Id, addItem);
@@ -180,17 +180,17 @@ public class TriggerDataService : ITriggerDataService
/// </summary>
public async Task<bool> UpdateTrigger(TriggerItem triggerItem)
{
if (_appStorageService.Triggers.TryGetValue(triggerItem.Id, out var triggerDto))
if (_appDataService.Triggers.TryGetValue(triggerItem.Id, out var triggerDto))
{
_mapper.Map(triggerItem, triggerDto);
if (await _appCenterService.TriggerManagementService.UpdateTriggerAsync(triggerDto) > 0)
{
if (_dataStorageService.Triggers.TryGetValue(triggerItem.Id,out var mTrigger))
if (_viewDataService.Triggers.TryGetValue(triggerItem.Id,out var mTrigger))
{
_mapper.Map(triggerItem,mTrigger);
//菜单
var menuItem = _dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.TriggerMenu && m.TargetId == triggerItem.Id);
var menuItem = _viewDataService.Menus.FirstOrDefault(m => m.MenuType == MenuType.TriggerMenu && m.TargetId == triggerItem.Id);
if (menuItem is not null)
{
menuItem.Header = triggerItem.Name;