From ffde374af2436ea2988a071fa067720ce7b6ba35 Mon Sep 17 00:00:00 2001
From: "David P.G" <pgw1315@163.com>
Date: Thu, 24 Jul 2025 21:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=98=E9=87=8F=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Interfaces/IVariableTableAppService.cs    |  2 +-
 .../Services/VariableTableAppService.cs       | 36 ++++++++++++++++---
 .../Services/VariableTableAppServiceTest.cs   | 24 +++++++++++++
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/DMS.Application/Interfaces/IVariableTableAppService.cs b/DMS.Application/Interfaces/IVariableTableAppService.cs
index e1879e7..4baa34d 100644
--- a/DMS.Application/Interfaces/IVariableTableAppService.cs
+++ b/DMS.Application/Interfaces/IVariableTableAppService.cs
@@ -11,6 +11,6 @@ namespace DMS.Application.Interfaces
         Task<List<VariableTableDto>> GetAllVariableTablesAsync();
         Task<VariableTableDto> CreateVariableTableAsync(CreateVariableTableWithMenuDto createDto);
         Task UpdateVariableTableAsync(VariableTableDto variableTableDto);
-        Task DeleteVariableTableAsync(int id);
+        Task<bool> DeleteVariableTableAsync(int id);
     }
 }
diff --git a/DMS.Application/Services/VariableTableAppService.cs b/DMS.Application/Services/VariableTableAppService.cs
index a688efa..01318e7 100644
--- a/DMS.Application/Services/VariableTableAppService.cs
+++ b/DMS.Application/Services/VariableTableAppService.cs
@@ -114,13 +114,41 @@ namespace DMS.Application.Services
         }
 
         /// <summary>
-        /// 异步根据ID删除变量表。
+        /// 异步根据ID删除变量表，包括其关联的变量、MQTT别名和菜单（事务性操作）。
         /// </summary>
         /// <param name="id">要删除的变量表ID。</param>
-        /// <returns>表示异步操作的任务。</returns>
-        public async Task DeleteVariableTableAsync(int id)
+        /// <returns>如果删除成功则为 true，否则为 false。</returns>
+        /// <exception cref="InvalidOperationException">如果删除变量表失败。</exception>
+        /// <exception cref="ApplicationException">如果删除变量表时发生其他错误。</exception>
+        public async Task<bool> DeleteVariableTableAsync(int id)
         {
-            await _repositoryManager.VariableTables.DeleteByIdAsync(id);
+            try
+            {
+                await _repositoryManager.BeginTranAsync();
+                var delRes = await _repositoryManager.VariableTables.DeleteByIdAsync(id);
+                if (delRes == 0)
+                {
+                    throw new InvalidOperationException($"删除变量表失败：变量表ID:{id}，请检查变量表Id是否存在");
+                }
+
+                // 删除关联的变量
+                await _repositoryManager.Variables.DeleteByIdAsync(id);
+
+                // 删除关联的MQTT别名
+                // await _repositoryManager.VariableMqttAlias.DeleteByVariableTableIdAsync(id);
+
+                // 删除关联的菜单树
+                await _repositoryManager.Menus.DeleteMenuTreeByTargetIdAsync(MenuType.VariableTableMenu, id);
+
+                await _repositoryManager.CommitAsync();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                await _repositoryManager.RollbackAsync();
+                // 可以在此记录日志
+                throw new ApplicationException($"删除变量表时发生错误，操作已回滚,错误信息:{ex.Message}", ex);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/DMS.Infrastructure.UnitTests/Services/VariableTableAppServiceTest.cs b/DMS.Infrastructure.UnitTests/Services/VariableTableAppServiceTest.cs
index 261ff1f..b94c96f 100644
--- a/DMS.Infrastructure.UnitTests/Services/VariableTableAppServiceTest.cs
+++ b/DMS.Infrastructure.UnitTests/Services/VariableTableAppServiceTest.cs
@@ -28,4 +28,28 @@ public class VariableTableAppServiceTest : BaseServiceTest
       var addVarTable= await  _variableTableAppService.CreateVariableTableAsync(dto);
       Assert.NotEqual(addVarTable.Id, 0);
     }
+
+    [Fact]
+    public async Task DeleteVariableTableAsyncTest()
+    {
+        // Arrange: Create a variable table first
+        var createDto = new CreateVariableTableWithMenuDto()
+        {
+            VariableTable = FakerHelper.FakeVariableTableDto(),
+            Menu = FakerHelper.FakeCreateMenuDto(),
+            DeviceId = 5 // Assuming a device with ID 5 exists for testing
+        };
+        var createdVariableTable = await _variableTableAppService.CreateVariableTableAsync(createDto);
+        Assert.NotEqual(createdVariableTable.Id, 0);
+
+        // Act: Delete the created variable table
+        var isDeleted = await _variableTableAppService.DeleteVariableTableAsync(createdVariableTable.Id);
+
+        // Assert: Verify deletion was successful
+        Assert.True(isDeleted);
+
+        // Optionally, try to retrieve the deleted variable table to confirm it's gone
+        var deletedTable = await _variableTableAppService.GetVariableTableByIdAsync(createdVariableTable.Id);
+        Assert.Null(deletedTable);
+    }
 }
\ No newline at end of file