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-18 11:24:56 +08:00
parent f7ee80bcdd
commit ed4f9b1a0c
5 changed files with 317 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
DMS.WPF/Services/DeviceDataService.cs
View File

@@ -32,7 +32,7 @@ public class DeviceDataService : IDeviceDataService
/// <param name="appDataCenterService">数据服务中心实例。</param>
public DeviceDataService(IMapper mapper, IAppDataCenterService appDataCenterService,
IAppDataStorageService appDataStorageService, IDataStorageService dataStorageService,
IEventService eventService,INotificationService notificationService,
IEventService eventService, INotificationService notificationService,
IMenuDataService menuDataService, IVariableDataService variableDataService)
{
_mapper = mapper;
@@ -52,10 +52,10 @@ public class DeviceDataService : IDeviceDataService
{
_uiDispatcher.Invoke(() =>
{
if (_dataStorageService.Devices.TryGetValue(e.DeviceId,out DeviceItemViewModel device))
if (_dataStorageService.Devices.TryGetValue(e.DeviceId, out DeviceItemViewModel device))
{
device.IsRunning = e.NewStatus;
if (device.IsRunning)
{
@@ -76,7 +76,7 @@ public class DeviceDataService : IDeviceDataService
{
foreach (var deviceDto in _appDataStorageService.Devices.Values)
{
_dataStorageService.Devices.Add(deviceDto.Id,_mapper.Map<DeviceItemViewModel>(deviceDto));
_dataStorageService.Devices.Add(deviceDto.Id, _mapper.Map<DeviceItemViewModel>(deviceDto));
}
}
@@ -86,67 +86,50 @@ public class DeviceDataService : IDeviceDataService
public async Task<CreateDeviceWithDetailsDto> AddDevice(CreateDeviceWithDetailsDto dto)
{
// 添加null检查
if (dto == null || _appDataCenterService == null || _appDataCenterService.DeviceManagementService == null)
if (dto == null)
return null;
var addDto = await _appDataCenterService.DeviceManagementService.CreateDeviceWithDetailsAsync(dto);
// 添加null检查
if (_dataStorageService != null && addDto != null && addDto.Device != null)
{
//更新当前界面
_dataStorageService.Devices.Add(addDto.Device.Id,_mapper.Map<DeviceItemViewModel>(addDto.Device));
}
// 添加null检查
if (_menuDataService != null && addDto != null && addDto.DeviceMenu != null)
{
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(addDto.DeviceMenu));
}
// 添加null检查
if (addDto != null && addDto.VariableTable != null)
{
await _variableDataService.AddVariableTable(addDto.VariableTable);
}
// 添加null检查
if (_menuDataService != null && addDto != null && addDto.VariableTableMenu != null)
{
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(addDto.VariableTableMenu));
}
// 添加null检查
if (_appDataCenterService.DeviceManagementService != null && addDto != null && addDto.Device != null)
{
//更新数据中心
_appDataCenterService.DeviceManagementService.AddDeviceToMemory(addDto.Device);
}
// 添加null检查
if (_appDataCenterService.VariableTableManagementService != null && addDto != null && addDto.VariableTable != null)
{
_appDataCenterService.VariableTableManagementService.AddVariableTableToMemory(addDto.VariableTable);
}
// 添加null检查
if (_appDataCenterService.MenuManagementService != null && addDto != null && addDto.DeviceMenu != null)
{
_appDataCenterService.MenuManagementService.AddMenuToMemory(addDto.DeviceMenu);
}
// 添加null检查
if (_appDataCenterService.MenuManagementService != null && addDto != null && addDto.VariableTableMenu != null)
{
_appDataCenterService.MenuManagementService.AddMenuToMemory(addDto.VariableTableMenu);
}
// 添加null检查
if (_menuDataService != null)
if (addDto == null && addDto.Device == null)
{
_menuDataService.BuildMenuTrees();
return null;
}
//给界面添加设备
_dataStorageService.Devices.Add(addDto.Device.Id, _mapper.Map<DeviceItemViewModel>(addDto.Device));
//更新数据中心
_appDataCenterService.DeviceManagementService.AddDeviceToMemory(addDto.Device);
// 给界面添加设备菜单
if (addDto.DeviceMenu != null)
{
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(addDto.DeviceMenu));
_appDataCenterService.MenuManagementService.AddMenuToMemory(addDto.DeviceMenu);
}
// 添加变量表和变量表菜单
if (addDto.VariableTable != null)
{
await _variableDataService.AddVariableTableToView(addDto.VariableTable);
_appDataCenterService.VariableTableManagementService.AddVariableTableToMemory(addDto.VariableTable);
if (addDto.VariableTable != null && addDto.VariableTableMenu != null)
{
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(addDto.VariableTableMenu));
_appDataCenterService.MenuManagementService.AddMenuToMemory(addDto.VariableTableMenu);
}
}
// 添加null检查
_menuDataService.BuildMenuTrees();
return addDto;
}
@@ -163,7 +146,7 @@ public class DeviceDataService : IDeviceDataService
_appDataCenterService.DeviceManagementService.RemoveDeviceFromMemory(device.Id);
// 删除设备
return _dataStorageService.Devices.Remove(device.Id);
}

50
DMS.WPF/Services/VariableDataService.cs
View File

@@ -1,10 +1,11 @@
using System.Collections.ObjectModel;
using AutoMapper;
using CommunityToolkit.Mvvm.ComponentModel;
using DMS.Application.DTOs;
using DMS.Application.Interfaces;
using DMS.Core.Models;
using DMS.WPF.Interfaces;
using DMS.WPF.ViewModels.Items;
using System.Collections.ObjectModel;
namespace DMS.WPF.Services;
@@ -24,7 +25,7 @@ public class VariableDataService : IVariableDataService
/// </summary>
/// <param name="mapper">AutoMapper 实例。</param>
/// <param name="appDataCenterService">数据服务中心实例。</param>
public VariableDataService(IMapper mapper,IDataStorageService dataStorageService, IAppDataCenterService appDataCenterService)
public VariableDataService(IMapper mapper, IDataStorageService dataStorageService, IAppDataCenterService appDataCenterService)
{
_mapper = mapper;
_dataStorageService = dataStorageService;
@@ -40,7 +41,7 @@ public class VariableDataService : IVariableDataService
{
foreach (var variable in variableTable.Value.Variables)
{
_dataStorageService.Variables.Add(variable.Id,variable);
_dataStorageService.Variables.Add(variable.Id, variable);
}
}
}
@@ -48,43 +49,20 @@ public class VariableDataService : IVariableDataService
/// <summary>
/// 添加变量表。
/// </summary>
public async Task<bool> AddVariableTable(VariableTableDto variableTableDto,
MenuBeanDto menuDto = null, bool isAddDb = false)
public async Task<bool> AddVariableTableToView(VariableTableDto tableDto)
{
// 添加null检查
if (variableTableDto == null)
if (tableDto == null || tableDto.DeviceId==0)
return false;
// 添加_appDataCenterService和_variableTableManagementService的null检查
if (_appDataCenterService == null || _appDataCenterService.VariableTableManagementService == null)
return false;
if (isAddDb && menuDto != null)
if (_dataStorageService.Devices.TryGetValue(tableDto.DeviceId, out var device))
{
// 添加null检查
if (_appDataCenterService.VariableTableManagementService == null)
return false;
CreateVariableTableWithMenuDto createDto = new CreateVariableTableWithMenuDto();
createDto.VariableTable = variableTableDto;
createDto.DeviceId = variableTableDto.DeviceId;
createDto.Menu = menuDto;
// 添加null检查
if (_appDataCenterService.VariableTableManagementService == null)
return false;
var resDto = await _appDataCenterService.VariableTableManagementService.CreateVariableTableAsync(createDto);
// 添加null检查
if (resDto != null && resDto.VariableTable != null && variableTableDto != null)
_mapper.Map(resDto.VariableTable, variableTableDto);
var variableTableItem = _mapper.Map<VariableTableItemViewModel>(tableDto);
device.VariableTables.Add(variableTableItem);
_dataStorageService.VariableTables.TryAdd(variableTableItem.Id,variableTableItem);
}
// 添加null检查
if (_appDataCenterService.VariableTableManagementService != null && variableTableDto != null)
_appDataCenterService.VariableTableManagementService.AddVariableTableToMemory(variableTableDto);
return true;
}
@@ -151,7 +129,7 @@ public class VariableDataService : IVariableDataService
return;
}
_dataStorageService.Variables.Add(variableItem.Id,variableItem);
_dataStorageService.Variables.Add(variableItem.Id, variableItem);
}
/// <summary>
@@ -159,14 +137,14 @@ public class VariableDataService : IVariableDataService
/// </summary>
public void DeleteVariable(int id)
{
if (!_dataStorageService.Variables.TryGetValue(id,out var variableItem))
if (!_dataStorageService.Variables.TryGetValue(id, out var variableItem))
{
return;
}
if (_dataStorageService.VariableTables.TryGetValue(variableItem.VariableTableId, out var variableTable))
{
variableTable.Variables.Remove(variableItem);
variableTable.Variables.Remove(variableItem);
}
_dataStorageService.Variables.Remove(variableItem.Id);