OPC DA 运行时读取Bug修复

cdy816 · Aug 17, 2022 · 5c3b9aa · 5c3b9aa
1 parent 143bba5
commit 5c3b9aa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/Run/Driver/Cdy.Spider.OpcDaClient/OpcDAChannel.cs b/Run/Driver/Cdy.Spider.OpcDaClient/OpcDAChannel.cs
@@ -23,7 +23,7 @@ namespace Cdy.Spider.OpcDAClient
     /// <summary>
     /// 
     /// </summary>
-    public class OpcUaChannel : ChannelBase2
+    public class OpcDAChannel : ChannelBase2
     {
 
         #region ... Variables  ...
@@ -87,7 +87,7 @@ public class OpcUaChannel : ChannelBase2
         /// <param name="host"></param>
         private Opc.Da.Server InitClient(Specification spec, string name,string host)
         {
-            Opc.Server[] servers = m_discovery.GetAvailableServers(spec, host, null);
+            Opc.Server[] servers = m_discovery.GetAvailableServers(spec, host,string.IsNullOrEmpty(mData.UserName)? null:new ConnectData(new System.Net.NetworkCredential() { UserName=mData.UserName,Password=mData.Password}));
 
             if (servers != null)
             {
@@ -121,15 +121,7 @@ public override void Init()
                 }
             }
 
-            if (IsSubscriptionMode)
-            {
-                mMonitoringGroup.Name = "Monitoring";                          // Group Name
-                mMonitoringGroup.ServerHandle = null;                          // The handle assigned by the server to the group.
-                mMonitoringGroup.ClientHandle = Guid.NewGuid().ToString();     // The handle assigned by the client to the group.
-                mMonitoringGroup.Active = true;                                // Activate the group.
-                mMonitoringGroup.UpdateRate = ScanCircle;                             // The refresh rate is 1 second. -> 1000
-                mMonitoringGroup.Deadband = 0;                                 // When the dead zone value is set to 0, the server will notify the group of any data changes in the group.
-            }
+
 
             base.Init();
         }
@@ -472,7 +464,7 @@ protected override object ReadValueInner(object value, int timeout, out bool res
         /// <returns></returns>
         public override ICommChannel2 NewApi()
         {
-            return new OpcUaChannel();
+            return new OpcDAChannel();
         }
 
         /// <summary>

diff --git a/Run/Driver/Cdy.Spider.OpcDaClient/OpcDAChannelData.cs b/Run/Driver/Cdy.Spider.OpcDaClient/OpcDAChannelData.cs
@@ -34,7 +34,7 @@ public override void LoadFromXML(XElement xe)
             base.LoadFromXML(xe);
             if (xe.Attribute("ServerName") != null)
             {
-                this.ServerIp = xe.Attribute("ServerName").Value;
+                this.ServerName = xe.Attribute("ServerName").Value;
             }
         }
 

diff --git a/Run/InSpiderRun/Config/ChannelRuntime.cfg b/Run/InSpiderRun/Config/ChannelRuntime.cfg
@@ -3,6 +3,7 @@
   <Channel Assembly="Cdy.Spider.MQTTClient.dll" Class="Cdy.Spider.MQTTClient.MQTTClientChannel" />
   <Channel Assembly="Cdy.Spider.MQTTServer.dll" Class="Cdy.Spider.MQTTServer.MQTTServerChannel" />
   <Channel Assembly="Cdy.Spider.OpcClient.dll" Class="Cdy.Spider.OpcClient.OpcUaChannel" />
+  <Channel Assembly="Cdy.Spider.OpcDAClient.dll" Class="Cdy.Spider.OpcDAClient.OpcDAChannel" />
   <Channel Assembly="Cdy.Spider.SerisePortClient.dll" Class="Cdy.Spider.SerisePortClient.SerisePortClientChannel" />
   <Channel Assembly="Cdy.Spider.TcpClient.dll" Class="Cdy.Spider.TcpClient.TcpClientChannel" />
   <Channel Assembly="Cdy.Spider.UdpClient.dll" Class="Cdy.Spider.UdpClient.UdpClientChannel" />

diff --git a/Run/InSpiderRun/Properties/launchSettings.json b/Run/InSpiderRun/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "InSpiderRun": {
       "commandName": "Executable",
-      "executablePath": "C:\\Users\\cdy81\\source\\repos\\cdy816\\Spider\\Output\\InSpiderRun.exe"
+      "executablePath": "C:\\Users\\chongdaoyang.JIUSIYI\\source\\repos\\cdy816\\Spider\\Output\\InSpiderRun.exe"
     },
     "WSL 2": {
       "commandName": "WSL2",