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-14 19:58:18 +08:00
parent 8e039e657a
commit ebf67b98fa
16 changed files with 144 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,42 +85,67 @@ public class DeviceDataService : IDeviceDataService
/// </summary>
public async Task<CreateDeviceWithDetailsDto> AddDevice(CreateDeviceWithDetailsDto dto)
{
// 添加null检查
if (dto == null || _appDataCenterService == null || _appDataCenterService.DeviceManagementService == null)
return null;
var addDto = await _appDataCenterService.DeviceManagementService.CreateDeviceWithDetailsAsync(dto);
//更新当前界面
_dataStorageService.Devices.Add(_mapper.Map<DeviceItemViewModel>(addDto.Device));
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(addDto.DeviceMenu));
// 添加null检查
if (addDto.VariableTable != null)
if (_dataStorageService != null && addDto != null && addDto.Device != null)
{
//更新当前界面
_dataStorageService.Devices.Add(_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 (addDto.VariableTableMenu != null)
if (_menuDataService != null && addDto != null && addDto.VariableTableMenu != null)
{
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(addDto.VariableTableMenu));
}
//更新数据中心
_appDataCenterService.DeviceManagementService.AddDeviceToMemory(addDto.Device);
// 添加null检查
if (_appDataCenterService.DeviceManagementService != null && addDto != null && addDto.Device != null)
{
//更新数据中心
_appDataCenterService.DeviceManagementService.AddDeviceToMemory(addDto.Device);
}
// 添加null检查
if (addDto.VariableTable != null)
if (_appDataCenterService.VariableTableManagementService != null && addDto != null && addDto.VariableTable != null)
{
_appDataCenterService.VariableTableManagementService.AddVariableTableToMemory(addDto.VariableTable);
}
_appDataCenterService.MenuManagementService.AddMenuToMemory(addDto.DeviceMenu);
// 添加null检查
if (_appDataCenterService.MenuManagementService != null && addDto != null && addDto.DeviceMenu != null)
{
_appDataCenterService.MenuManagementService.AddMenuToMemory(addDto.DeviceMenu);
}
// 添加null检查
if (addDto.VariableTableMenu != null)
if (_appDataCenterService.MenuManagementService != null && addDto != null && addDto.VariableTableMenu != null)
{
_appDataCenterService.MenuManagementService.AddMenuToMemory(addDto.VariableTableMenu);
}
_menuDataService.BuildMenuTrees();
// 添加null检查
if (_menuDataService != null)
{
_menuDataService.BuildMenuTrees();
}
return addDto;
}

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

@@ -51,20 +51,39 @@ public class VariableDataService : IVariableDataService
public async Task<bool> AddVariableTable(VariableTableDto variableTableDto,
MenuBeanDto menuDto = null, bool isAddDb = false)
{
// 添加null检查
if (variableTableDto == null)
return false;
// 添加_appDataCenterService和_variableTableManagementService的null检查
if (_appDataCenterService == null || _appDataCenterService.VariableTableManagementService == null)
return false;
if (isAddDb && menuDto != null)
{
// 添加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);
_mapper.Map(resDto.VariableTable, variableTableDto);
// 添加null检查
if (resDto != null && resDto.VariableTable != null && variableTableDto != null)
_mapper.Map(resDto.VariableTable, variableTableDto);
}
_appDataCenterService.VariableTableManagementService.AddVariableTableToMemory(variableTableDto);
// 添加null检查
if (_appDataCenterService.VariableTableManagementService != null && variableTableDto != null)
_appDataCenterService.VariableTableManagementService.AddVariableTableToMemory(variableTableDto);
return true;
}