- 重构了 VariableTableDataService 中的 AddVariableTable 方法,使其返回值从 bool 变为新表的 ID (int)。这使得服务层更加健壮,并能向调用方提供新创建实体的确切ID。 Fix: - 修复了 DeviceDetailViewModel 在创建变量表后UI不自动更新的Bug。现在视图模型会正确地将新表添加到UI集合中,确保了界面的即时刷新。 Feat: - 为 DeviceDetailViewModel 添加了 IsBusy 状态。现在“添加”、“编辑”和“删除”等异步操作会更新此状态,防止了用户重复点击,并允许UI在处理期间显示加载指示,提升了用户体验。
122 lines
4.0 KiB
C#
122 lines
4.0 KiB
C#
using System.Collections.ObjectModel;
|
|
using AutoMapper;
|
|
using DMS.Application.DTOs;
|
|
using DMS.Application.Interfaces;
|
|
using DMS.Core.Enums;
|
|
using DMS.WPF.Interfaces;
|
|
using DMS.WPF.ViewModels.Items;
|
|
|
|
namespace DMS.WPF.Services;
|
|
|
|
public class VariableTableDataService : IVariableTableDataService
|
|
{
|
|
private readonly IMapper _mapper;
|
|
private readonly IDataStorageService _dataStorageService;
|
|
private readonly IAppDataCenterService _appDataCenterService;
|
|
private readonly IMenuDataService _menuDataService;
|
|
|
|
|
|
|
|
public VariableTableDataService(IMapper mapper, IDataStorageService dataStorageService, IAppDataCenterService appDataCenterService,
|
|
IMenuDataService menuDataService)
|
|
{
|
|
_mapper = mapper;
|
|
_dataStorageService = dataStorageService;
|
|
_appDataCenterService = appDataCenterService;
|
|
_menuDataService = menuDataService;
|
|
}
|
|
|
|
|
|
public void LoadAllVariableTables()
|
|
{
|
|
foreach (var device in _dataStorageService.Devices)
|
|
{
|
|
foreach (var variableTable in device.Value.VariableTables)
|
|
{
|
|
_dataStorageService.VariableTables.Add(variableTable.Id,variableTable);
|
|
}
|
|
}
|
|
}
|
|
|
|
public async Task<int> AddVariableTable(VariableTableDto variableTableDto,
|
|
MenuBeanDto menuDto = null, bool isAddDb = false)
|
|
{
|
|
if (variableTableDto == null)
|
|
return 0;
|
|
|
|
if (isAddDb && menuDto != null)
|
|
{
|
|
CreateVariableTableWithMenuDto createDto = new CreateVariableTableWithMenuDto();
|
|
createDto.VariableTable = variableTableDto;
|
|
createDto.DeviceId = variableTableDto.DeviceId;
|
|
createDto.Menu = menuDto;
|
|
var resDto = await _appDataCenterService.VariableTableManagementService.CreateVariableTableAsync(createDto);
|
|
|
|
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(resDto.Menu));
|
|
return resDto.VariableTable.Id;
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
public async Task<bool> UpdateVariableTable(VariableTableItemViewModel variableTable)
|
|
{
|
|
if (variableTable == null)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
var variableTableDto = _mapper.Map<VariableTableDto>(variableTable);
|
|
if (await _appDataCenterService.VariableTableManagementService.UpdateVariableTableAsync(variableTableDto) > 0)
|
|
{
|
|
// 更新数据库后会自动更新内存,无需额外操作
|
|
|
|
var menu = _dataStorageService.Menus.FirstOrDefault(m =>
|
|
m.MenuType == MenuType.VariableTableMenu &&
|
|
m.TargetId == variableTable.Id);
|
|
if (menu != null)
|
|
{
|
|
menu.Header = variableTable.Name;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
public async Task<bool> DeleteVariableTable(VariableTableItemViewModel variableTable, bool isDeleteDb = false)
|
|
{
|
|
if (variableTable == null)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (isDeleteDb)
|
|
{
|
|
if (!await _appDataCenterService.VariableTableManagementService.DeleteVariableTableAsync(variableTable.Id))
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// 删除与当前变量表关联的所有变量
|
|
foreach (var variable in variableTable.Variables)
|
|
{
|
|
_dataStorageService.Variables.Remove(variable.Id);
|
|
}
|
|
|
|
// 删除变量表界面相关的菜单
|
|
|
|
var variableTableMenu
|
|
=_dataStorageService.Menus.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu && m.TargetId == variableTable.Id);
|
|
_menuDataService.DeleteMenuItem(variableTableMenu);
|
|
// 删除变量表
|
|
_dataStorageService.VariableTables.Remove(variableTable.Id);
|
|
variableTable.Device.VariableTables.Remove(variableTable);
|
|
return true;
|
|
}
|
|
} |