refactor:重构了变量的导入和删除

DMS.WPF/Services/ViewService/VariableViewService.cs

@@ -53,45 +53,6 @@ public class VariableViewService : IVariableViewService
         }
     }
 
-    /// <summary>
-    /// 添加变量表。
-    /// </summary>
-    public async Task<bool> AddVariableTableToView(VariableTable tableDto)
-    {
-        // 添加null检查
-        if (tableDto == null || tableDto.DeviceId == 0)
-            return false;
-
-        if (_viewDataService.Devices.TryGetValue(tableDto.DeviceId, out var device))
-        {
-            var variableTableItem = _mapper.Map<VariableTableItem>(tableDto);
-            device.VariableTables.Add(variableTableItem);
-            _viewDataService.VariableTables.TryAdd(variableTableItem.Id, variableTableItem);
-        }
-
-
-        return true;
-    }
-
-    /// <summary>
-    /// 更新变量表。
-    /// </summary>
-    public async Task<bool> UpdateVariableTable(VariableTableItem variableTableItem)
-    {
-        if (variableTableItem is null)
-        {
-            return false;
-        }
-
-        var variableTable = _mapper.Map<VariableTable>(variableTableItem);
-        if (await _appCenterService.VariableTableManagementService.UpdateAsync(variableTable) > 0)
-        {
-            // 更新数据库后会自动更新内存，无需额外操作
-            return true;
-        }
-
-        return false;
-    }
 
 
     /// <summary>
@@ -110,7 +71,7 @@ public class VariableViewService : IVariableViewService
     /// <summary>
     /// 添加变量。
     /// </summary>
-    public async Task<bool> AddAsync(List<VariableItem> variableItems, VariableTableItem variableTable)
+    public async Task<List<VariableItem>> AddAsync(List<VariableItem> variableItems, VariableTableItem variableTable)
     {
 
         foreach (var variableDto in variableItems)
@@ -123,35 +84,17 @@ public class VariableViewService : IVariableViewService
 
         var resVariables = await _variableManagementService.AddAsync(_mapper.Map<List<Variable>>(variableItems));
         
-            
-
         List<VariableItem> resVariableItems = _mapper.Map<List<VariableItem>>(resVariables);
         foreach (var variableItem in resVariableItems)
         {
             _viewDataService.Variables.TryAdd(variableItem.Id, variableItem);
             variableTable.Variables.Add(variableItem);
+            variableItem.VariableTable = variableTable;
         }
 
-        return true;
+        return resVariableItems;
     }
 
-    /// <summary>
-    /// 删除变量。
-    /// </summary>
-    public void DeleteVariable(int id)
-    {
-        if (!_viewDataService.Variables.TryGetValue(id, out var variableItem))
-        {
-            return;
-        }
-
-        if (_viewDataService.VariableTables.TryGetValue(variableItem.VariableTableId, out var variableTable))
-        {
-            variableTable.Variables.Remove(variableItem);
-        }
-
-        _viewDataService.Variables.Remove(variableItem.Id);
-    }
 
     public async Task<bool> DeleteAsync(List<VariableItem> variableItems)
     {
@@ -163,8 +106,19 @@ public class VariableViewService : IVariableViewService
                 deleteList.Add(mVariable);
             }
         }
+        if (!deleteList.Any()) return false;    
 
-        return await _variableManagementService.DeleteAsync(deleteList);
+        var res=await _variableManagementService.DeleteAsync(deleteList);
+        if (res)
+        {
+            foreach (var variable in deleteList)
+            {
+                _viewDataService.Variables.Remove(variable.Id);
+                variable.VariableTable.Variables.Remove(variable);
+            }
+        }
+
+        return res;
     }
 
 
@@ -179,8 +133,21 @@ public class VariableViewService : IVariableViewService
         {
             foreach (var item in importedVariables)
             {
-                bool slelect = item.Name == variable.Name || item.S7Address == variable.S7Address || item.OpcUaNodeId == variable.OpcUaNodeId;
-                if (slelect)
+                var isExist = false;
+
+                if (variable.Protocol == Core.Enums.ProtocolType.S7)
+                {
+                    isExist = item.Name == variable.Name || item.S7Address == variable.S7Address;
+                }else if (variable.Protocol == Core.Enums.ProtocolType.OpcUa)
+                {
+                    isExist = item.Name == variable.Name || item.OpcUaNodeId == variable.OpcUaNodeId;
+                }
+                else
+                {
+                    isExist = item.Name == variable.Name;
+                }
+
+                if (isExist)
                 {
                     existList.Add(item);
                 }