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

feat.修复新添加设备添加变量OpcServer报错问题，修改初始化菜单的内容

Browse Source
This commit is contained in:
David P.G
2025-10-04 00:42:59 +08:00
parent 24e4259e31
commit 5eae862d5f
6 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DMS.Application/Events/VariableTableChangedEventArgs.cs
View File

@@ -18,10 +18,6 @@ namespace DMS.Application.Events
/// </summary>
public VariableTableDto VariableTable { get; }
/// <summary>
/// 关联的设备DTO
/// </summary>
public DeviceDto Device { get; }
/// <summary>
/// 变更时间
@@ -34,11 +30,10 @@ namespace DMS.Application.Events
/// <param name="changeType">变更类型</param>
/// <param name="variableTable">变量表DTO</param>
/// <param name="device">关联的设备DTO</param>
public VariableTableChangedEventArgs(DataChangeType changeType, VariableTableDto variableTable, DeviceDto device)
public VariableTableChangedEventArgs(DataChangeType changeType, VariableTableDto variableTable)
{
ChangeType = changeType;
VariableTable = variableTable;
Device = device;
ChangeTime = DateTime.Now;
}
}

4
DMS.Application/Services/Management/DeviceManagementService.cs
View File

@@ -53,6 +53,10 @@ public class DeviceManagementService : IDeviceManagementService
{
_eventService.RaiseDeviceChanged(this, new DeviceChangedEventArgs(DataChangeType.Added, result.Device));
}
if (_appDataStorageService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
{
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(DataChangeType.Added, result.VariableTable));
}
}
return result;

9
DMS.Application/Services/Management/VariableTableManagementService.cs
View File

@@ -82,8 +82,7 @@ public class VariableTableManagementService : IVariableTableManagementService
{
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Added,
result.VariableTable,
deviceDto));
result.VariableTable));
}
}
@@ -109,8 +108,7 @@ public class VariableTableManagementService : IVariableTableManagementService
_appDataStorageService.VariableTables.AddOrUpdate(variableTableDto.Id, variableTableDto, (key, oldValue) => variableTableDto);
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Updated,
variableTableDto,
deviceDto));
variableTableDto));
}
return result;
@@ -139,8 +137,7 @@ public class VariableTableManagementService : IVariableTableManagementService
_eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
DataChangeType.Deleted,
variableTableDto,
deviceDto));
variableTableDto));
}
}