refactor:将所有的ItemViewMdoel的名字删除ViewModel，并将命名空间调整为DMS.WPF.ItemViewModel.

DMS.WPF/Interfaces/IDataStorageService.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 using ObservableCollections;
 
 namespace DMS.WPF.Interfaces;
@@ -10,40 +10,40 @@ public interface IDataStorageService
     /// <summary>
     /// 设备列表。
     /// </summary>
-    ObservableDictionary<int, DeviceItemViewModel> Devices { get; set; }
+    ObservableDictionary<int, DeviceItem> Devices { get; set; }
 
     /// <summary>
     /// 设备列表。
     /// </summary>
-    ObservableDictionary<int, VariableTableItemViewModel> VariableTables { get; set; }
+    ObservableDictionary<int, VariableTableItem> VariableTables { get; set; }
 
     /// <summary>
     /// 变量数据列表。
     /// </summary>
-    ObservableDictionary<int, VariableItemViewModel> Variables { get; set; }
+    ObservableDictionary<int, VariableItem> Variables { get; set; }
 
     /// <summary>
     /// MQTT服务器列表。
     /// </summary>
-    ObservableDictionary<int, MqttServerItemViewModel> MqttServers { get; set; }
+    ObservableDictionary<int, MqttServerItem> MqttServers { get; set; }
 
     /// <summary>
     /// 菜单列表。
     /// </summary>
-    ObservableCollection<MenuItemViewModel> Menus { get; set; }
+    ObservableCollection<MenuItem> Menus { get; set; }
 
     /// <summary>
     /// 菜单树列表。
     /// </summary>
-    ObservableCollection<MenuItemViewModel> MenuTrees { get; set; }
+    ObservableCollection<MenuItem> MenuTrees { get; set; }
 
     /// <summary>
     /// 日志列表。
     /// </summary>
-    ObservableCollection<NlogItemViewModel> Nlogs { get; set; }
+    ObservableCollection<NlogItem> Nlogs { get; set; }
 
     /// <summary>
     /// 触发器列表。
     /// </summary>
-    ObservableDictionary<int, TriggerItemViewModel> Triggers { get; set; }
+    ObservableDictionary<int, TriggerItem> Triggers { get; set; }
 }

DMS.WPF/Interfaces/IDeviceDataService.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using DMS.Application.DTOs;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 
@@ -12,7 +12,7 @@ public interface IDeviceDataService
     /// <summary>
     /// 设备列表。
     /// </summary>
-    // ObservableCollection<DeviceItemViewModel> Devices { get; set; }
+    // ObservableCollection<DeviceItem> Devices { get; set; }
 
     /// <summary>
     /// 加载所有设备数据。
@@ -27,10 +27,10 @@ public interface IDeviceDataService
     /// <summary>
     /// 删除设备。
     /// </summary>
-    Task<bool> DeleteDevice(DeviceItemViewModel device);
+    Task<bool> DeleteDevice(DeviceItem device);
 
     /// <summary>
     /// 更新设备。
     /// </summary>
-    Task<bool> UpdateDevice(DeviceItemViewModel device);
+    Task<bool> UpdateDevice(DeviceItem device);
 }

DMS.WPF/Interfaces/ILogDataService.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using DMS.Application.Events;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 

DMS.WPF/Interfaces/IMenuDataService.cs

@@ -1,5 +1,5 @@
 using System.Collections.ObjectModel;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 
@@ -13,12 +13,12 @@ public interface IMenuDataService
     /// <summary>
     /// 添加菜单项。
     /// </summary>
-    Task AddMenuItem(MenuItemViewModel menuItemViewModel);
+    Task AddMenuItem(MenuItem MenuItem);
 
     /// <summary>
     /// 删除菜单项。
     /// </summary>
-    Task DeleteMenuItem(MenuItemViewModel? menuItemViewModel);
+    Task DeleteMenuItem(MenuItem? MenuItem);
 
     void LoadAllMenus();
 

DMS.WPF/Interfaces/IMqttDataService.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using DMS.Application.DTOs;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 
@@ -19,15 +19,15 @@ public interface IMqttDataService
     /// <summary>
     /// 添加MQTT服务器。
     /// </summary>
-    Task<MqttServerItemViewModel> AddMqttServer(MqttServerItemViewModel mqttServer);
+    Task<MqttServerItem> AddMqttServer(MqttServerItem mqttServer);
 
     /// <summary>
     /// 更新MQTT服务器。
     /// </summary>
-    Task<bool> UpdateMqttServer(MqttServerItemViewModel mqttServer);
+    Task<bool> UpdateMqttServer(MqttServerItem mqttServer);
 
     /// <summary>
     /// 删除MQTT服务器。
     /// </summary>
-    Task<bool> DeleteMqttServer(MqttServerItemViewModel mqttServer);
+    Task<bool> DeleteMqttServer(MqttServerItem mqttServer);
 }

DMS.WPF/Interfaces/INavigatable.cs

@@ -1,7 +1,7 @@
 // 文件: DMS.WPF/Services/INavigatable.cs
 
 using DMS.Core.Models;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 

DMS.WPF/Interfaces/INavigationService.cs

@@ -1,7 +1,7 @@
 // 文件: DMS.WPF/Services/INavigationService.cs
 
 using DMS.Core.Models;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 

DMS.WPF/Interfaces/ITriggerDataService.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using DMS.Application.DTOs;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 
@@ -17,15 +17,15 @@ public interface ITriggerDataService
     /// <summary>
     /// 添加触发器。
     /// </summary>
-    Task<TriggerItemViewModel> AddTrigger(TriggerItemViewModel dto);
+    Task<TriggerItem> AddTrigger(TriggerItem dto);
 
     /// <summary>
     /// 删除触发器。
     /// </summary>
-    Task<bool> DeleteTrigger(TriggerItemViewModel trigger);
+    Task<bool> DeleteTrigger(TriggerItem trigger);
 
     /// <summary>
     /// 更新触发器。
     /// </summary>
-    Task<bool> UpdateTrigger(TriggerItemViewModel trigger);
+    Task<bool> UpdateTrigger(TriggerItem trigger);
 }

DMS.WPF/Interfaces/IVariableDataService.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using DMS.Application.DTOs;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 
@@ -23,17 +23,17 @@ public interface IVariableDataService
     /// <summary>
     /// 更新变量表。
     /// </summary>
-    Task<bool> UpdateVariableTable(VariableTableItemViewModel variableTable);
+    Task<bool> UpdateVariableTable(VariableTableItem variableTable);
 
     /// <summary>
     /// 删除变量表。
     /// </summary>
-    Task<bool> DeleteVariableTable(VariableTableItemViewModel variableTable, bool isDeleteDb = false);
+    Task<bool> DeleteVariableTable(VariableTableItem variableTable, bool isDeleteDb = false);
 
     /// <summary>
     /// 添加变量。
     /// </summary>
-    void AddVariable(VariableItemViewModel variableItem);
+    void AddVariable(VariableItem variableItem);
 
     /// <summary>
     /// 删除变量。

DMS.WPF/Interfaces/IVariableTableDataService.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using DMS.Application.DTOs;
-using DMS.WPF.ViewModels.Items;
+using DMS.WPF.ItemViewModel;
 
 namespace DMS.WPF.Interfaces;
 
@@ -12,6 +12,6 @@ public interface IVariableTableDataService
     Task<int> AddVariableTable(VariableTableDto variableTableDto,
                                 MenuBeanDto menuDto = null, bool isAddDb = false);
 
-    Task<bool> UpdateVariableTable(VariableTableItemViewModel variableTable);
-    Task<bool> DeleteVariableTable(VariableTableItemViewModel variableTable, bool isDeleteDb = false);
+    Task<bool> UpdateVariableTable(VariableTableItem variableTable);
+    Task<bool> DeleteVariableTable(VariableTableItem variableTable, bool isDeleteDb = false);
 }