wip

DMS.Application/Services/Database/DeviceAppService.cs

@@ -68,6 +68,7 @@ public class DeviceAppService : IDeviceAppService
             // 假设有设备菜单
             if (dto.DeviceMenu is not null)
             {
+                dto.DeviceMenu.TargetId = dto.Device.Id;
                 dto.DeviceMenu = await _repoManager.Menus.AddAsync(dto.DeviceMenu);
             }
 
@@ -82,6 +83,7 @@ public class DeviceAppService : IDeviceAppService
                 {
                     throw new InvalidOperationException($"添加设备变量表失败,设备：{dto.Device.Name},变量表：{dto?.VariableTable?.Name}");
                 }
+                dto.VariableTable.Device = dto.Device;
 
                 // 假设有设备菜单
                 if (dto.VariableTableMenu is not null && dto.VariableTableMenu is not null)
@@ -136,15 +138,6 @@ public class DeviceAppService : IDeviceAppService
         return res;
     }
 
-    /// <summary>
-    /// 异步删除一个设备。
-    /// </summary>
-    /// <param name="device">要删除的设备实体。</param>
-    /// <returns>表示异步操作的任务。</returns>
-    public async Task DeleteDeviceAsync(Device device)
-    {
-       await DeleteDeviceByIdAsync(device.Id);
-    }
 
     /// <summary>
     /// 异步根据ID删除一个设备，包括其关联的变量表和菜单（事务性操作）。
@@ -153,19 +146,19 @@ public class DeviceAppService : IDeviceAppService
     /// <returns>如果删除成功则为 true，否则为 false。</returns>
     /// <exception cref="InvalidOperationException">如果删除设备失败。</exception>
     /// <exception cref="ApplicationException">如果删除设备时发生其他错误。</exception>
-    public async Task<bool> DeleteDeviceByIdAsync(int deviceId)
+    public async Task<bool> DeleteAsync(Device device)
     {
         try
         {
             await _repoManager.BeginTranAsync();
-            var delRes = await _repoManager.Devices.DeleteByIdAsync(deviceId);
+            var delRes = await _repoManager.Devices.DeleteAsync(device);
             if (delRes == 0)
             {
-                throw new InvalidOperationException($"删除设备失败：设备ID:{deviceId}，请检查设备Id是否存在");
+                throw new InvalidOperationException($"删除设备失败：设备ID:{device.Id}，请检查设备Id是否存在");
             }
 
             // 删除关联的变量表
-            await _repoManager.VariableTables.DeleteByDeviceIdAsync(deviceId);
+            await _repoManager.VariableTables.DeleteAsync(device.VariableTables);
             // 删除关联的变量
             await _repoManager.Variables.DeleteByVariableTableIdAsync(deviceId);