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-23 16:25:22 +08:00
parent 54d040b45f
commit 125348486a
15 changed files with 329 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
DMS.Application/Services/Database/VariableTableAppService.cs
View File

@@ -15,6 +15,7 @@ namespace DMS.Application.Services.Database
public class VariableTableAppService : IVariableTableAppService
{
private readonly IRepositoryManager _repositoryManager;
private readonly IAppDataService _appDataService;
private readonly IMapper _mapper;
/// <summary>
@@ -22,9 +23,10 @@ namespace DMS.Application.Services.Database
/// </summary>
/// <param name="repositoryManager">仓储管理器实例。</param>
/// <param name="mapper">AutoMapper 实例。</param>
public VariableTableAppService(IRepositoryManager repositoryManager, IMapper mapper)
public VariableTableAppService(IRepositoryManager repositoryManager, IAppDataService appDataService, IMapper mapper)
{
_repositoryManager = repositoryManager;
_appDataService = appDataService;
_mapper = mapper;
}
@@ -55,43 +57,24 @@ namespace DMS.Application.Services.Database
/// <param name="createDto">包含变量表和菜单信息的创建数据传输对象。</param>
/// <returns>创建后的变量表数据传输对象。</returns>
/// <exception cref="ApplicationException">如果添加变量表失败或找不到设备菜单。</exception>
public async Task<CreateVariableTableWithMenuDto> CreateVariableTableAsync(CreateVariableTableWithMenuDto createDto)
public async Task<CreateVariableTableWithMenuDto> AddAsync(CreateVariableTableWithMenuDto createDto)
{
await _repositoryManager.BeginTranAsync();
try
{
var variableTable = _mapper.Map<VariableTable>(createDto.VariableTable);
variableTable.DeviceId = createDto.DeviceId;
var createdVariableTable = await _repositoryManager.VariableTables.AddAsync(variableTable);
if (createdVariableTable.Id == 0)
createDto.VariableTable = await _repositoryManager.VariableTables.AddAsync(createDto.VariableTable);
if (createDto.VariableTable.Id == 0)
{
throw new ApplicationException($"添加变量表失败，设备ID:{createDto.DeviceId},请检查。");
throw new ApplicationException($"添加变量表失败，设备ID:{createDto.VariableTable.DeviceId},请检查。");
}
_mapper.Map(createdVariableTable, createDto.VariableTable);
if (createDto.Menu!=null)
if (createDto.Menu is not null)
{
// 获取设备菜单，作为变量表菜单的父级
//var deviceMenu
// = await _repositoryManager.Menus.GetMenuByTargetIdAsync(
// MenuType.DeviceMenu, createDto.DeviceId);
//if (deviceMenu == null)
//{
// throw new ApplicationException($"添加变量表菜单时，找不到设备ID:{createDto.DeviceId},请检查。");
//}
// 映射菜单实体并设置关联信息
// var menu = _mapper.Map<MenuBean>(createDto.Menu);
// menu.ParentId = deviceMenu.Id;
// menu.TargetId = createdVariableTable.Id;
// menu.MenuType = MenuType.VariableTableMenu;
//var addMenu= await _repositoryManager.Menus.AddAsync(menu);
//_mapper.Map(addMenu, createDto.Menu);
createDto.Menu.TargetId = createDto.VariableTable.Id;
//映射菜单实体并设置关联信息
createDto.Menu = await _repositoryManager.Menus.AddAsync(createDto.Menu);
}
await _repositoryManager.CommitAsync();
@@ -110,28 +93,21 @@ namespace DMS.Application.Services.Database
/// <param name="variableTable">要更新的变量表数据传输对象。</param>
/// <returns>受影响的行数。</returns>
/// <exception cref="ApplicationException">如果找不到变量表。</exception>
public async Task<int> UpdateVariableTableAsync(VariableTable variableTableDto)
public async Task<int> UpdateAsync(VariableTable variableTable)
{
try
{
await _repositoryManager.BeginTranAsync();
var variableTable = await _repositoryManager.VariableTables.GetByIdAsync(variableTableDto.Id);
if (variableTable == null)
{
throw new ApplicationException($"VariableTable with ID {variableTableDto.Id} not found.");
}
_mapper.Map(variableTableDto, variableTable);
int res = await _repositoryManager.VariableTables.UpdateAsync(variableTable);
await _repositoryManager.CommitAsync();
return res;
}
catch (Exception ex)
int res = await _repositoryManager.VariableTables.UpdateAsync(variableTable);
// 更新关联的菜单树
var menu = _appDataService.Menus.Values.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu && m.TargetId == variableTable.Id);
if (menu is not null && variableTable.Name!= menu.Header)
{
await _repositoryManager.RollbackAsync();
// 可以在此记录日志
throw new ApplicationException($"更新变量表时发生错误，操作已回滚,错误信息:{ex.Message}", ex);
menu.Header = variableTable.Name;
// 更新关联的菜单树
await _repositoryManager.Menus.UpdateAsync(menu);
}
return res;
}
/// <summary>
@@ -141,30 +117,20 @@ namespace DMS.Application.Services.Database
/// <returns>如果删除成功则为 true，否则为 false。</returns>
/// <exception cref="InvalidOperationException">如果删除变量表失败。</exception>
/// <exception cref="ApplicationException">如果删除变量表时发生其他错误。</exception>
public async Task<bool> DeleteVariableTableAsync(int id)
public async Task<bool> DeleteAsync(VariableTable variableTable)
{
try
{
await _repositoryManager.BeginTranAsync();
var variableTable = await _repositoryManager.VariableTables.GetByIdAsync(id);
if (variableTable == null)
{
throw new InvalidOperationException($"删除变量表失败：变量表ID:{id}，请检查变量表Id是否存在");
}
var delRes = await _repositoryManager.VariableTables.DeleteAsync(variableTable);
if (delRes == 0)
{
throw new InvalidOperationException($"删除变量表失败：变量表ID:{id}，请检查变量表Id是否存在");
}
// 删除关联的变量
await _repositoryManager.Variables.DeleteByVariableTableIdAsync(id);
// 删除关联的MQTT别名
// await _repositoryManager.MqttAlias.DeleteByVariableTableIdAsync(id);
// 删除关联的菜单树
//await _repositoryManager.Menus.DeleteMenuTreeByTargetIdAsync(MenuType.VariableTableMenu, id);
var menu = _appDataService.Menus.Values.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu && m.TargetId == variableTable.Id);
if (menu is not null)
{
// 删除关联的菜单树
await _repositoryManager.Menus.DeleteAsync(menu);
}
await _repositoryManager.CommitAsync();
return true;