修改opcua客户端驱动，优化前端

iioter · Dec 26, 2021 · 60185bb · 60185bb
1 parent 5232d88
commit 60185bb
Show file tree

Hide file tree

Showing 25 changed files with 2,547 additions and 153 deletions.
diff --git a/.vs/IoTGateway/DesignTimeBuild/.dtbcache.v2 b/.vs/IoTGateway/DesignTimeBuild/.dtbcache.v2
diff --git a/.vs/IoTGateway/v16/.suo b/.vs/IoTGateway/v16/.suo
diff --git a/Dockerfile-win b/Dockerfile-win
diff --git a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Index.cshtml b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Index.cshtml
@@ -51,10 +51,10 @@
             }, 1500);
 
             //状态
-            $('#id' + objmsg.VarId + '_StatusType').text(objmsg.StatusType);
-            $('#id' + objmsg.VarId + '_StatusType').addClass('animated bounceIn');            
+            $('#id' + objmsg.VarId + '_State').text(objmsg.StatusType);
+            $('#id' + objmsg.VarId + '_State').addClass('animated bounceIn');
             setTimeout(function(){
-                 $('#id' + objmsg.VarId + '_StatusType').removeClass('bounceIn');
+                 $('#id' + objmsg.VarId + '_State').removeClass('bounceIn');
             }, 1500);
         })
     }

diff --git a/IoTGateway/iotgateway.db b/IoTGateway/iotgateway.db
diff --git a/Plugins/Drivers/DriverOPCUaClient/DriverOPCUaClient.csproj b/Plugins/Drivers/DriverOPCUaClient/DriverOPCUaClient.csproj
@@ -8,8 +8,6 @@
 
 	<ItemGroup>
 	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.4.367.75" />
-	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.4.367.75" />
-	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.4.367.75" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Plugins/Drivers/DriverOPCUaClient/OPCUaClient.cs b/Plugins/Drivers/DriverOPCUaClient/OPCUaClient.cs
@@ -7,16 +7,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Opc.Ua.Configuration;
+using OpcUaHelper;
 
 namespace DriverOPCUaClient
 {
     [DriverSupported("OPC UA")]
     [DriverInfoAttribute("OPCUaClient", "V1.0.0", "Copyright WHD© 2021-12-19")]
     public class OPCUaClient : IDriver
     {
-        Session session = null;
-        ApplicationConfiguration config = null;
-        ConfiguredEndpoint endpoint = null;
+        OpcUaClientHelper opcUaClient = null;
         #region 配置参数
 
         [ConfigParameter("设备Id")]
@@ -37,18 +36,7 @@ public OPCUaClient(Guid deviceId)
         {
             DeviceId = deviceId;
 
-            ApplicationInstance application = new ApplicationInstance
-            {
-                ApplicationName = "ConsoleReferenceClient",
-                ApplicationType = ApplicationType.Client,
-                ConfigSectionName = "Quickstarts.ReferenceClient",
-                CertificatePasswordProvider = new CertificatePasswordProvider(null)
-            };
-            config = application.LoadApplicationConfiguration(silent: false).Result;
-
-            EndpointDescription endpointDescription = CoreClientUtils.SelectEndpoint(application.ApplicationConfiguration, Uri, false);
-            EndpointConfiguration endpointConfiguration = EndpointConfiguration.Create(application.ApplicationConfiguration);
-            endpoint = new ConfiguredEndpoint(null, endpointDescription, endpointConfiguration);
+            opcUaClient = new OpcUaClientHelper();
         }
 
 
@@ -57,15 +45,15 @@ public bool IsConnected
             get
             {
 
-                return session != null && session.Connected;
+                return opcUaClient != null && opcUaClient.Connected;
             }
         }
 
         public bool Connect()
         {
             try
             {
-                session = Session.Create(config, endpoint, false, false, config.ApplicationName, 30 * 60 * 1000, new UserIdentity(), null).Result;
+                opcUaClient.ConnectServer(Uri).Wait((int)Timeout);
             }
             catch (Exception)
             {
@@ -78,7 +66,7 @@ public bool Close()
         {
             try
             {
-                session?.Close();
+                opcUaClient?.Disconnect();
                 return !IsConnected;
             }
             catch (Exception)
@@ -92,8 +80,7 @@ public void Dispose()
         {
             try
             {
-                session?.Dispose();
-                session = null;
+                opcUaClient = null;
             }
             catch (Exception)
             {
@@ -111,7 +98,7 @@ public DriverReturnValueModel ReadNode(DriverAddressIoArgModel ioarg)
             {
                 try
                 {
-                    var dataValue = session.ReadValue(new NodeId(ioarg.Address));
+                    var dataValue = opcUaClient.ReadNode(new NodeId(ioarg.Address));
                     if (DataValue.IsGood(dataValue))
                         ret.Value = dataValue.Value;
                 }