完成添加OPC变量

Data/Entities/DbVariableData.cs

@@ -24,6 +24,7 @@ public class DbVariableData
     /// <summary>
     /// 节点ID，用于标识变量在设备或系统中的唯一路径。
     /// </summary>
+    [SugarColumn(IsNullable = true)]
     public string NodeId { get; set; } = String.Empty;
     
     /// <summary>

Models/VariableData.cs

@@ -78,6 +78,12 @@ public partial class VariableData : ObservableObject
     /// </summary>
     public bool IsActive { get; set; }
 
+    /// <summary>
+    /// 指示变量是否被选中
+    /// </summary>
+    [ObservableProperty]
+    public bool isSelect;
+
     /// <summary>
     /// 指示是否需要保存变量数据。
     /// </summary>

ViewModels/Dialogs/OpcUaImportDialogViewModel.cs

@@ -23,6 +23,8 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
     [ObservableProperty]
     private ObservableCollection<VariableData> _selectedNodeVariables;
 
+    public List<VariableData> SelectedVariables { get; set; }=new List<VariableData>();
+
     [ObservableProperty]
     private bool _selectAllVariables;
 
@@ -128,7 +130,6 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
                 */
 
 
-            
             // 1. 创建应用程序配置
             var application = new ApplicationInstance
                               {
@@ -144,15 +145,43 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
                              ApplicationType = application.ApplicationType,
                              SecurityConfiguration = new SecurityConfiguration
                                                      {
-                    ApplicationCertificate = new CertificateIdentifier { StoreType = "Directory", StorePath = "%CommonApplicationData%/OPC Foundation/CertificateStores/MachineDefault", SubjectName = application.ApplicationName },
+                                                         ApplicationCertificate = new CertificateIdentifier
-                    TrustedIssuerCertificates = new CertificateTrustList { StoreType = "Directory", StorePath = "%CommonApplicationData%/OPC Foundation/CertificateStores/UA Certificate Authorities" },
+                                                             {
-                    TrustedPeerCertificates = new CertificateTrustList { StoreType = "Directory", StorePath = "%CommonApplicationData%/OPC Foundation/CertificateStores/UA Applications" },
+                                                                 StoreType = "Directory",
-                    RejectedCertificateStore = new CertificateTrustList { StoreType = "Directory", StorePath = "%CommonApplicationData%/OPC Foundation/CertificateStores/RejectedCertificates" },
+                                                                 StorePath
+                                                                     = "%CommonApplicationData%/OPC Foundation/CertificateStores/MachineDefault",
+                                                                 SubjectName = application.ApplicationName
+                                                             },
+                                                         TrustedIssuerCertificates
+                                                             = new CertificateTrustList
+                                                               {
+                                                                   StoreType = "Directory",
+                                                                   StorePath
+                                                                       = "%CommonApplicationData%/OPC Foundation/CertificateStores/UA Certificate Authorities"
+                                                               },
+                                                         TrustedPeerCertificates
+                                                             = new CertificateTrustList
+                                                               {
+                                                                   StoreType = "Directory",
+                                                                   StorePath
+                                                                       = "%CommonApplicationData%/OPC Foundation/CertificateStores/UA Applications"
+                                                               },
+                                                         RejectedCertificateStore
+                                                             = new CertificateTrustList
+                                                               {
+                                                                   StoreType = "Directory",
+                                                                   StorePath
+                                                                       = "%CommonApplicationData%/OPC Foundation/CertificateStores/RejectedCertificates"
+                                                               },
                                                          AutoAcceptUntrustedCertificates = true // 自动接受不受信任的证书 (仅用于测试)
                                                      },
                              TransportQuotas = new TransportQuotas { OperationTimeout = 15000 },
                              ClientConfiguration = new ClientConfiguration { DefaultSessionTimeout = 60000 },
-                TraceConfiguration = new TraceConfiguration { OutputFilePath = "./Logs/OpcUaClient.log", DeleteOnLoad = true, TraceMasks = Utils.TraceMasks.Error | Utils.TraceMasks.Security }
+                             TraceConfiguration = new TraceConfiguration
+                                                  {
+                                                      OutputFilePath = "./Logs/OpcUaClient.log", DeleteOnLoad = true,
+                                                      TraceMasks = Utils.TraceMasks.Error | Utils.TraceMasks.Security
+                                                  }
                          };
             application.ApplicationConfiguration = config;
 
@@ -183,6 +212,7 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
             NotificationHelper.ShowError($"连接 OPC UA 服务器失败: {EndpointUrl} - {ex.Message}", ex);
         }
     }
+
     /// <summary>
     /// 处理来自服务器的数据变化通知
     /// </summary>
@@ -190,7 +220,8 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
     {
         foreach (var value in item.DequeueValues())
         {
-            Console.WriteLine($"[通知] {item.DisplayName}: {value.Value} | 时间戳: {value.SourceTimestamp.ToLocalTime()} | 状态: {value.StatusCode}");
+            Console.WriteLine(
+                $"[通知] {item.DisplayName}: {value.Value} | 时间戳: {value.SourceTimestamp.ToLocalTime()} | 状态: {value.StatusCode}");
         }
     }
 
@@ -309,13 +340,42 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
                 // 如果是变量，添加到右侧列表
                 if (nodeType == NodeType.Variable)
                 {
+                    // Read the DataType attribute
+                    ReadValueId readValueId = new ReadValueId
+                                              {
+                                                  NodeId = opcUaNode.NodeId,
+                                                  AttributeId = Attributes.DataType,
+                                                  // You might need to specify IndexRange and DataEncoding if dealing with arrays or specific encodings
+                                              };
+
+                    DataValueCollection results;
+                    DiagnosticInfoCollection diagnosticInfos;
+
+                    _session.Read(
+                        null, // RequestHeader
+                        0, // MaxAge
+                        TimestampsToReturn.Source,
+                        new ReadValueIdCollection { readValueId },
+                        out results,
+                        out diagnosticInfos
+                    );
+
+                    string dataType = string.Empty;
+
+                    if (results != null && results.Count > 0 && results[0].Value != null)
+                    {
+                        // Convert the NodeId of the DataType to a readable string
+                        NodeId dataTypeNodeId = (NodeId)results[0].Value;
+                        dataType = _session.NodeCache.GetDisplayText(dataTypeNodeId);
+                    }
+
                     SelectedNodeVariables.Add(new VariableData
                                               {
                                                   Name = opcUaNode.DisplayName,
-                                                  NodeId = opcUaNode.NodeId.ToString(),
                                                   OpcUaNodeId = opcUaNode.NodeId.ToString(),
                                                   ProtocolType = ProtocolType.OpcUA,
-                                                  IsActive = true // 默认选中
+                                                  IsActive = true, // Default selected
+                                                  DataType = dataType // Assign the read DataType
                                               });
                 }
             }
@@ -335,6 +395,6 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
 
     public ObservableCollection<VariableData> GetSelectedVariables()
     {
-        return new ObservableCollection<VariableData>(SelectedNodeVariables.Where(v => v.IsActive));
+        return new ObservableCollection<VariableData>(SelectedVariables);
     }
 }

Views/Dialogs/OpcUaImportDialog.xaml

@@ -25,14 +25,26 @@
         </Grid.ColumnDefinitions>
 
         <!-- 连接设置 -->
-        <StackPanel Grid.Row="0" Grid.ColumnSpan="2" Orientation="Horizontal" Margin="0,0,0,10">
+        <StackPanel Grid.Row="0"
-            <TextBlock Text="Endpoint URL:" VerticalAlignment="Center" Margin="0,0,5,0" />
+                    Grid.ColumnSpan="2"
-            <TextBox Text="{Binding EndpointUrl, UpdateSourceTrigger=PropertyChanged}" Width="300" Margin="0,0,10,0" />
+                    Orientation="Horizontal"
-            <Button Content="连接" Command="{Binding ConnectCommand}" />
+                    Margin="0,0,0,10">
+            <TextBlock Text="Endpoint URL:"
+                       VerticalAlignment="Center"
+                       Margin="0,0,5,0" />
+            <TextBox Text="{Binding EndpointUrl, UpdateSourceTrigger=PropertyChanged}"
+                     Width="300"
+                     Margin="0,0,10,0" />
+            <Button Content="连接"
+                    Command="{Binding ConnectCommand}" />
         </StackPanel>
 
         <!-- 节点树 -->
-        <TreeView Grid.Row="1" Grid.Column="0" ItemsSource="{Binding OpcUaNodes}" Margin="0,0,10,0" SelectedItemChanged="TreeView_SelectedItemChanged">
+        <TreeView Grid.Row="1"
+                  Grid.Column="0"
+                  ItemsSource="{Binding OpcUaNodes}"
+                  Margin="0,0,10,0"
+                  SelectedItemChanged="TreeView_SelectedItemChanged">
             <TreeView.ItemTemplate>
                 <HierarchicalDataTemplate ItemsSource="{Binding Children}">
                     <TextBlock Text="{Binding DisplayName}" />
@@ -41,23 +53,32 @@
         </TreeView>
 
         <!-- 变量列表 -->
-        <DataGrid Grid.Row="1" Grid.Column="1" ItemsSource="{Binding SelectedNodeVariables}" AutoGenerateColumns="False" IsReadOnly="True">
+        <DataGrid Grid.Row="1"
+                  Grid.Column="1"
+                  ItemsSource="{Binding SelectedNodeVariables}"
+                  SelectionChanged="Selector_OnSelectionChanged"
+                  AutoGenerateColumns="False"
+                  IsReadOnly="True">
             <DataGrid.Columns>
                 <DataGridTemplateColumn>
                     <DataGridTemplateColumn.HeaderTemplate>
                         <DataTemplate>
-                            <CheckBox IsChecked="{Binding DataContext.SelectAllVariables, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+                            <CheckBox
+                                IsChecked="{Binding DataContext.SelectAllVariables, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
                         </DataTemplate>
                     </DataGridTemplateColumn.HeaderTemplate>
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" />
+                            <CheckBox IsChecked="{Binding IsSelect, UpdateSourceTrigger=PropertyChanged}" />
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="名称" Binding="{Binding DisplayName}" />
+                <DataGridTextColumn Header="名称"
-                <DataGridTextColumn Header="节点ID" Binding="{Binding NodeId}" />
+                                    Binding="{Binding  Name}" />
-                <DataGridTextColumn Header="数据类型" Binding="{Binding DataType}" />
+                <DataGridTextColumn Header="节点ID"
+                                    Binding="{Binding OpcUaNodeId}" />
+                <DataGridTextColumn Header="数据类型"
+                                    Binding="{Binding DataType}" />
             </DataGrid.Columns>
         </DataGrid>
     </Grid>

Views/Dialogs/OpcUaImportDialog.xaml.cs

@@ -1,4 +1,5 @@
 using System.Windows;
+using System.Windows.Controls;
 using CommunityToolkit.Mvvm.Messaging;
 using iNKORE.UI.WPF.Modern.Controls;
 using PMSWPF.Models;
@@ -41,4 +42,17 @@ public partial class OpcUaImportDialog : ContentDialog
             await ViewModel.LoadNodeVariables(selectedNode);
         }
     }
+
+
+    private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs args)
+    {
+        if (args.AddedItems!=null && args.AddedItems.Count>0)
+        {
+            foreach (var item in args.AddedItems)
+            {
+                ViewModel.SelectedVariables.Add((VariableData)item);
+            }
+            
+        }
+    }
 }