Skip to content

Commit 1cf5b79

Browse files
mdornausGoetzGoerisch
authored andcommitted
Added static Identification.
1 parent fa626e0 commit 1cf5b79

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

umatiGateway/Core/Mqtt/MqttProvider.cs

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,35 +1093,34 @@ public void publishIdentificationMachineNodes()
10931093
if (machineNode != null && machineNode.ResolvedNodeId != null)
10941094
{
10951095
{
1096-
List<NodeId> identificationNodes = client.BrowseNodeIds(new BrowseDescriptionCollection { BrowseUtils.GetHierarchicalChildren(machineNode.ResolvedNodeId, (int)NodeClass.Object) });
1097-
//List<NodeId> identificationNodes = client.BrowseLocalNodeIds(machineNode.ResolvedNodeId, BrowseDirection.Forward, (int)NodeClass.Object, ReferenceTypeIds.HierarchicalReferences, true);
1098-
foreach (NodeId child in identificationNodes)
1096+
JObject data = new JObject();
1097+
JObject ident = new JObject();
1098+
ident = JObject.Parse(@"{
1099+
""<GroupIdentifier>"": {},
1100+
""SerialNumber"": ""37731"",
1101+
""ProductInstanceUri"": ""http://herding.de"",
1102+
""Model"" : ""Herding FLEXPRO 1500-24-2-3_SB"",
1103+
""Manufacturer"": {
1104+
""locale"": """",
1105+
""text"": ""Herding GmbH Filtertechnik""
1106+
}
1107+
}");
1108+
data.Add("Data", ident);
1109+
data.Add("MachineId", machineNode.InstanceNamespace);
1110+
data.Add("ParentId", "nsu=http:_2F_2Fopcfoundation.org_2FUA_2FMachinery_2F;i=1001");
1111+
if (string.IsNullOrEmpty(machineNode.BaseType))
10991112
{
1100-
Node? childNode = client.ReadNode(child);
1101-
if (childNode != null)
1102-
{
1103-
if (childNode.BrowseName.Name == "Identification")
1104-
{
1105-
JObject data = new JObject();
1106-
JObject ident = new JObject();
1107-
createJSON(ident, child, machineNode, null, false);
1108-
data.Add("Data", ident);
1109-
data.Add("MachineId", machineNode.InstanceNamespace);
1110-
data.Add("ParentId", "nsu=http:_2F_2Fopcfoundation.org_2FUA_2FMachinery_2F;i=1001");
1111-
if (string.IsNullOrEmpty(machineNode.BaseType))
1112-
{
1113-
data.Add("Topic", config.Prefix + "/" + config.ClientId + "/" + machineNode.TypeBrowseName + "/" + machineNode.InstanceNamespace);
1114-
data.Add("TypeDefinition", machineNode.TypeBrowseName);
1115-
}
1116-
else
1117-
{
1118-
data.Add("Topic", config.Prefix + "/" + config.ClientId + "/" + machineNode.BaseType + "/" + machineNode.InstanceNamespace);
1119-
data.Add("TypeDefinition", machineNode.BaseType);
1120-
}
1121-
identificationArray.Add(data);
1122-
}
1123-
}
1113+
data.Add("Topic", config.Prefix + "/" + config.ClientId + "/" + machineNode.TypeBrowseName + "/" + machineNode.InstanceNamespace);
1114+
data.Add("TypeDefinition", machineNode.TypeBrowseName);
11241115
}
1116+
else
1117+
{
1118+
data.Add("Topic", config.Prefix + "/" + config.ClientId + "/" + machineNode.BaseType + "/" + machineNode.InstanceNamespace);
1119+
data.Add("TypeDefinition", machineNode.BaseType);
1120+
}
1121+
identificationArray.Add(data);
1122+
1123+
11251124
if (string.IsNullOrEmpty(machineNode.BaseType))
11261125
{
11271126
WriteIdentification(identificationArray, machineNode.InstanceNamespace, machineNode.TypeBrowseName);

0 commit comments

Comments
 (0)