Merge pull request #173 from Azure/dev_hans_methodchange
make direct method key name compatible with config file
This commit is contained in:
Коммит
0985e54f01
|
@ -272,7 +272,7 @@ namespace OpcPublisher
|
|||
}
|
||||
|
||||
// process all nodes
|
||||
foreach (var node in publishNodesMethodData.Nodes)
|
||||
foreach (var node in publishNodesMethodData.OpcNodes)
|
||||
{
|
||||
NodeId nodeId = null;
|
||||
ExpandedNodeId expandedNodeId = null;
|
||||
|
@ -397,7 +397,7 @@ namespace OpcPublisher
|
|||
}
|
||||
else
|
||||
{
|
||||
foreach (var node in unpublishNodesMethodData.Nodes)
|
||||
foreach (var node in unpublishNodesMethodData.OpcNodes)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
@ -697,7 +697,7 @@ namespace OpcPublisher
|
|||
{
|
||||
getConfiguredNodesOnEndpointMethodResponse.ContinuationToken = (ulong)nodeConfigVersion << 32 | actualNodeCount + startIndex;
|
||||
}
|
||||
getConfiguredNodesOnEndpointMethodResponse.Nodes = opcNodes.GetRange((int)startIndex, (int)actualNodeCount).Select(n => new OpcNodeOnEndpointModel(n.Id)
|
||||
getConfiguredNodesOnEndpointMethodResponse.OpcNodes = opcNodes.GetRange((int)startIndex, (int)actualNodeCount).Select(n => new OpcNodeOnEndpointModel(n.Id)
|
||||
{
|
||||
OpcPublishingInterval = n.OpcPublishingInterval,
|
||||
OpcSamplingInterval = n.OpcSamplingInterval,
|
||||
|
|
|
@ -166,7 +166,7 @@ namespace OpcPublisher
|
|||
{
|
||||
public PublishNodesMethodRequestModel(string endpointUrl, bool useSecurity = true, string userName = null, string password = null)
|
||||
{
|
||||
Nodes = new List<OpcNodeOnEndpointModel>();
|
||||
OpcNodes = new List<OpcNodeOnEndpointModel>();
|
||||
EndpointUrl = endpointUrl;
|
||||
UseSecurity = useSecurity;
|
||||
UserName = userName;
|
||||
|
@ -174,7 +174,7 @@ namespace OpcPublisher
|
|||
}
|
||||
|
||||
public string EndpointUrl { get; set; }
|
||||
public List<OpcNodeOnEndpointModel> Nodes { get; set; }
|
||||
public List<OpcNodeOnEndpointModel> OpcNodes { get; set; }
|
||||
|
||||
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
|
||||
public bool UseSecurity { get; set; }
|
||||
|
@ -193,13 +193,13 @@ namespace OpcPublisher
|
|||
{
|
||||
public UnpublishNodesMethodRequestModel(string endpointUrl)
|
||||
{
|
||||
Nodes = new List<OpcNodeOnEndpointModel>();
|
||||
OpcNodes = new List<OpcNodeOnEndpointModel>();
|
||||
EndpointUrl = endpointUrl;
|
||||
}
|
||||
|
||||
public string EndpointUrl { get; set; }
|
||||
|
||||
public List<OpcNodeOnEndpointModel> Nodes { get; set; }
|
||||
public List<OpcNodeOnEndpointModel> OpcNodes { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -273,17 +273,17 @@ namespace OpcPublisher
|
|||
{
|
||||
public GetConfiguredNodesOnEndpointMethodResponseModel()
|
||||
{
|
||||
Nodes = new List<OpcNodeOnEndpointModel>();
|
||||
OpcNodes = new List<OpcNodeOnEndpointModel>();
|
||||
}
|
||||
|
||||
/// <param name="nodes"></param>
|
||||
public GetConfiguredNodesOnEndpointMethodResponseModel(List<OpcNodeOnEndpointModel> nodes)
|
||||
{
|
||||
Nodes = nodes;
|
||||
OpcNodes = nodes;
|
||||
}
|
||||
|
||||
[JsonProperty(NullValueHandling = NullValueHandling.Include)]
|
||||
public List<OpcNodeOnEndpointModel> Nodes { get; set; }
|
||||
public List<OpcNodeOnEndpointModel> OpcNodes { get; set; }
|
||||
|
||||
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
|
||||
public ulong? ContinuationToken { get; set; }
|
||||
|
|
Загрузка…
Ссылка в новой задаче