diff --git a/emf_datamodel/model/iPos_Datamodel.aird b/emf_datamodel/model/iPos_Datamodel.aird index 82db91d5c118ab307d3c98dca53d5483d69dc44b..a5275bfd77929d900e552acb0743ef8016b90ad8 100644 --- a/emf_datamodel/model/iPos_Datamodel.aird +++ b/emf_datamodel/model/iPos_Datamodel.aird @@ -9,11 +9,11 @@ <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> <target xmi:type="ecore:EPackage" href="iPos_Datamodel.ecore#/"/> </ownedRepresentationDescriptors> - <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_vF3jwDx2EeyWNq6fFfWVSw" name="OFBiz" repPath="#_vFz5YDx2EeyWNq6fFfWVSw" changeId="6019583a-c829-4ec2-b77e-f550d421a9a6"> + <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_vF3jwDx2EeyWNq6fFfWVSw" name="OFBiz" repPath="#_vFz5YDx2EeyWNq6fFfWVSw" changeId="42ca2046-f1e0-4eb3-ae25-3099986f2d01"> <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> <target xmi:type="ecore:EPackage" href="iPos_Datamodel.ecore#//OFBiz"/> </ownedRepresentationDescriptors> - <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_FmM9IDx3EeyWNq6fFfWVSw" name="IPosDevKit" repPath="#_FmLvADx3EeyWNq6fFfWVSw" changeId="5d6cffd9-40cf-4e43-ae27-ccfd4f29d08b"> + <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_FmM9IDx3EeyWNq6fFfWVSw" name="IPosDevKit" repPath="#_FmLvADx3EeyWNq6fFfWVSw" changeId="dba22626-4cf8-4799-a08f-56749d1c9a45"> <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> <target xmi:type="ecore:EPackage" href="iPos_Datamodel.ecore#//IPosDevKit"/> </ownedRepresentationDescriptors> @@ -3195,7 +3195,7 @@ </ownedStyle> <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> </ownedElements> - <ownedElements xmi:type="diagram:DNodeListElement" uid="_VbmTEDx4EeyWNq6fFfWVSw" name="binLocationNumber : Int" tooltipText=""> + <ownedElements xmi:type="diagram:DNodeListElement" uid="_VbmTEDx4EeyWNq6fFfWVSw" name="binLocationNumber : String" tooltipText=""> <target xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//OFBiz/PicklistBin/binLocationNumber"/> <semanticElements xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//OFBiz/PicklistBin/binLocationNumber"/> <ownedStyle xmi:type="diagram:BundledImage" uid="_VbmTETx4EeyWNq6fFfWVSw" labelAlignment="LEFT"> @@ -3407,6 +3407,10 @@ <styles xmi:type="notation:FontStyle" xmi:id="_GFJi9zx3EeyWNq6fFfWVSw" fontName="Segoe UI" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_GFJi-Dx3EeyWNq6fFfWVSw"/> </children> + <children xmi:type="notation:Node" xmi:id="_uj364FdaEeyyocYQuYPGPQ" type="3010" element="_uiokwFdaEeyyocYQuYPGPQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_uj364VdaEeyyocYQuYPGPQ" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_uj364ldaEeyyocYQuYPGPQ"/> + </children> <styles xmi:type="notation:SortingStyle" xmi:id="_GFGfoTx3EeyWNq6fFfWVSw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_GFGfojx3EeyWNq6fFfWVSw"/> </children> @@ -3536,7 +3540,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GE5rUjx3EeyWNq6fFfWVSw" name="MonitoringRequest" tooltipText="" width="12" height="10"> <target xmi:type="ecore:EClass" href="iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest"/> <semanticElements xmi:type="ecore:EClass" href="iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest"/> - <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GE6SYDx3EeyWNq6fFfWVSw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_w4NVA1daEeyyocYQuYPGPQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> @@ -3628,6 +3632,14 @@ </ownedStyle> <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> </ownedElements> + <ownedElements xmi:type="diagram:DNodeListElement" uid="_uiokwFdaEeyyocYQuYPGPQ" name="refSystemId : String" tooltipText=""> + <target xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/refSystemId"/> + <semanticElements xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/refSystemId"/> + <ownedStyle xmi:type="diagram:BundledImage" uid="_w4PKN1daEeyyocYQuYPGPQ" labelAlignment="LEFT"> + <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> + </ownedElements> </ownedDiagramElements> <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GE6SYjx3EeyWNq6fFfWVSw" name="WorldModelUpdateRequest" tooltipText="" width="12" height="10"> <target xmi:type="ecore:EClass" href="iPos_Datamodel.ecore#//IPosDevKit/WorldModelUpdateRequest"/> diff --git a/emf_datamodel/model/iPos_Datamodel.ecore b/emf_datamodel/model/iPos_Datamodel.ecore index de00fce4222b9aa5867bdf30d48a482c7a6b2ba8..b5a51ebe2a6d7355ccebfeab51b90359ef957b64 100644 --- a/emf_datamodel/model/iPos_Datamodel.ecore +++ b/emf_datamodel/model/iPos_Datamodel.ecore @@ -250,7 +250,7 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="PicklistBin"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="picklistId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="binLocationNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="binLocationNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="picklistItems" upperBound="-1" eType="#//OFBiz/PicklistItem"/> </eClassifiers> @@ -283,6 +283,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringTaskId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="requestorProtocol" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="serializationType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="refSystemId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="WorldModelUpdateRequest"/> <eClassifiers xsi:type="ecore:EClass" name="DataStorageRequest"/> diff --git a/emf_datamodel/model/iPos_Datamodel.genmodel b/emf_datamodel/model/iPos_Datamodel.genmodel index 571545c871e2169fe1886938b64a1fa41373cafe..a63721d3edf8324ecb1753bf7338427c5f4b789c 100644 --- a/emf_datamodel/model/iPos_Datamodel.genmodel +++ b/emf_datamodel/model/iPos_Datamodel.genmodel @@ -216,6 +216,7 @@ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/monitoringTaskId"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/requestorProtocol"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/serializationType"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/refSystemId"/> </genClasses> <genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/WorldModelUpdateRequest"/> <genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/DataStorageRequest"/> diff --git a/init_Orderpicker.txt b/init_Orderpicker.txt index ce0db97ff6792337c2d7fc92d7236c903952d1e6..3baf143e7703bcacbe1e832b9d0d9e592c7c058b 100644 --- a/init_Orderpicker.txt +++ b/init_Orderpicker.txt @@ -1,4 +1,5 @@ -{"frames": [{"id": "box_1", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 0.8,"y": 5.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]}, {"id": "box_2", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 1.6,"y": 5.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]}, {"id": "box_3", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 2.4,"y": 5.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]}, {"id": "box_4", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 3.2,"y": 5.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]}, {"id": "box_5", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 4.0,"y": 5.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]}, {"id": "box_6", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 4.8,"y": 5.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]}, {"id": "shipmentBin_1", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 0.8,"y": 4.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]}, {"id": "shipmentBin_2", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 1.6,"y": 4.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]}, {"id": "shipmentBin_3", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 2.4,"y": 4.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.3, "y": 0.3, "z":15.0}]} ]} +{"frames": [{"id": "box_1", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 0.5,"y": 2.7,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.8, "y": 0.5, "z":15.0}]}, {"id": "box_2", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 0.5,"y": 3.45,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.8, "y": 0.5, "z":15.0}]}, {"id": "box_3", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 0.5,"y": 4.25,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.8, "y": 0.5, "z":15.0}]}, {"id": "shipmentBin_1", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 3.0,"y": 2.57,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.8, "y": 0.5, "z":15.0}]}, {"id": "shipmentBin_2", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 2.7,"y": 3.75,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 0.8, "y": 0.5, "z":15.0}]}, {"id": "cobot1_door_zone", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 2.0,"y": 1.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 6.0, "y": 4.0, "z":6.0}]}, {"id": "cobot1_window_zone", "space": [{"position": {"refSystemId": "ROOT", "point": {"x": 2.0,"y": 5.0,"z": 0.0}, "accuracy": 0.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "x": 6.0, "y": 4.0, "z":6.0}]} ]} {"refSystems": [{"id": "ROOT"}, {"id": "CETI_ROOT", "position": {"refSystemId": "ROOT", "point": {"x": 3.05,"y": 2.08,"z": 0.0}, "accuracy": 1.0}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}}]} -{"objectConfigs": [{"agentId": "Employee_1", "sensorId": "UWB_2", "agentType": "HUMAN", "sensorType": "UWB"}]} -{"pois": [{"id": "885", "description": "Beacon_Position", "data": {"type" : "UWB"}, "position": {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }, {"id": "2934", "description": "Beacon_Position", "data": {"type" : "UWB"}, "position": {"refSystemId": "ROOT", "point": {"x": 4.24,"y": 1.33,"z": 1.0}, "accuracy": 0.01}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }, {"id": "3383", "description": "Beacon_Position", "data": {"type" : "UWB"}, "position": {"refSystemId": "ROOT", "point": {"x": 1.25,"y": 5.89,"z": 1.06}, "accuracy": 0.01}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }, {"id": "1107", "description": "Beacon_Position", "data": {"type" : "UWB"}, "position": {"refSystemId": "ROOT", "point": {"x": 4.24,"y": 5.83,"z": 1.05}, "accuracy": 0.01}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }]} \ No newline at end of file +{"objectConfigs": [{"agentId": "Employee_1", "sensorId": "UWB_2", "agentType": "HUMAN", "sensorType": "UWB"}, {"agentId": "turtlebot", "sensorId": "UWB_1", "agentType": "ROBOT", "sensorType": "UWB"}, {"agentId": "turtlebot", "sensorId": "98:CD:AC:26:2D:18", "agentType": "ROBOT", "sensorType": "RFID_SCANNER"}]} +{"pois": [{"id": "885", "description": "Beacon_Position", "data": {"type" : "UWB"}, "position": {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }, {"id": "2934", "description": "Beacon_Position", "data": {"type" : "UWB"}, "position": {"refSystemId": "ROOT", "point": {"x": 4.24,"y": 1.33,"z": 1.0}, "accuracy": 0.01}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }, {"id": "3383", "description": "Beacon_Position", "data": {"type" : "UWB"}, "position": {"refSystemId": "ROOT", "point": {"x": 1.25,"y": 5.89,"z": 1.06}, "accuracy": 0.01}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }, {"id": "1107", "description": "Beacon_Position", "data": {"type" : "UWB"}, "position": {"refSystemId": "ROOT", "point": {"x": 4.24,"y": 5.83,"z": 1.05}, "accuracy": 0.01}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }, {"id": "83221710", "description": "RFID_TAG", "data": {"type" : "NFC"}, "position": {"refSystemId": "ROOT", "point": {"x": 1.8,"y": 2.3,"z": 0.5}, "accuracy": 0.1}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }, {"id": "31762128", "description": "RFID_TAG", "data": {"type" : "NFC"}, "position": {"refSystemId": "ROOT", "point": {"x": 1.6,"y": 2.9,"z": 0.5}, "accuracy": 0.1}, "orientation": {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0} }]} +{"monitoringRequests": [{"frameIds": ["cobot1_door_zone", "cobot1_window_zone"], "monitoringTaskId": "RobolabMonitoringCeti", "refSystemId": "CETI_ROOT", "serializationType": "protobuf"}, {"frameIds": ["cobot1_door_zone", "cobot1_window_zone"], "monitoringTaskId": "ipos/client/position", "serializationType": "json"}]} \ No newline at end of file diff --git a/src/main/java/ipos/project/CustomLoggingFilter.java b/src/main/java/ipos/project/CustomLoggingFilter.java index 3e396ab05b1a2e858698255a84f1758f63f6cc27..bbdd617b1940fcae249fbe28bfa4410e3b64793a 100644 --- a/src/main/java/ipos/project/CustomLoggingFilter.java +++ b/src/main/java/ipos/project/CustomLoggingFilter.java @@ -29,7 +29,7 @@ public class CustomLoggingFilter extends Filter<ILoggingEvent> { }else if (event.getMessage().contains("SHELL:")){ return FilterReply.ACCEPT; } else { - return FilterReply.DENY; + return FilterReply.ACCEPT; } } diff --git a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/SimpleSceneIntegration.java b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/SimpleSceneIntegration.java index 116ab1501bc3a9f68af8ed6f4c63e507a587b330..e5d1fca306821c55f1b7d070cd444f85b9858401 100644 --- a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/SimpleSceneIntegration.java +++ b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/SimpleSceneIntegration.java @@ -107,7 +107,7 @@ public class SimpleSceneIntegration { MqttMessage mqttMessage = mqttService.createMqttMsg(posEvent_proto, 0, false); logging_sdf(monitoringTaskId, serializationType, posEvent_proto); logging_indfro(positionEvent, monitoringTaskId, serializationType); - + logging_op(positionEvent, monitoringTaskId, serializationType); publishRespectingSerializationType(monitoringTaskId, serializationType, ProtoJsonMap.toJson(posEvent_proto), mqttMessage); }else{ @@ -115,6 +115,11 @@ public class SimpleSceneIntegration { } } + private static void logging_op(PositionEvent positionEvent, String monitoringTaskId, String serializationType) { + LOG.info("OP: Publishing PositionEvent on topic " + monitoringTaskId + ": ZoneDescriptors:" + logZoneDescr(positionEvent.getZonedescriptors()) + "; serializationType: " + serializationType); + LOG.info("OP:"); + } + private static PositionEvent duplicatePositionEvent(PositionEvent positionEvent) { PositionEventImpl posEvent_copy = (PositionEventImpl) positionEvent; ObjectMapper objectMapper = new ObjectMapper(); @@ -152,7 +157,7 @@ public class SimpleSceneIntegration { if (PositionMonitoring.JSON_SERIALIZATION_TYPE.equals(serializationType)){ String fakeTopic = "ipos/client/position"; mqttService.publish(topic, jsonString, 0, false); - LOG.info("publishing JSON mqttMessage:" + jsonString + " on topic: " + fakeTopic); + LOG.info("publishing JSON mqttMessage:" + jsonString + " on topic: " + topic); } } diff --git a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/service/SimpleSceneTransformer.java b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/service/SimpleSceneTransformer.java index be074b790bbdd043b771c8a28bf878989756b5d7..ec721049658d45d5b424f70eed06127fc694b0c4 100644 --- a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/service/SimpleSceneTransformer.java +++ b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/service/SimpleSceneTransformer.java @@ -31,6 +31,7 @@ public class SimpleSceneTransformer { monReqInt.setExitNotification(monReqProto.getExitNotification()); monReqInt.setProperties(monReqProto.getPropertiesList()); monReqInt.setMonitoringTaskId(monReqProto.getMonitoringTaskId()); + monReqInt.setRefSystemId(monReqProto.getRefSystemId()); monReqInt.setRequestorProtocol(monReqProto.getRequestorProtocol()); monReqInt.setSerializationType(monReqProto.getSerializationType()); return monReqInt; diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/IPosDevKitPackage.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/IPosDevKitPackage.java index 6c809431926b1014fee096e5b8a347bfedce28b9..5484baafa8c95ae735d6f3d916c2acd31a2544c8 100644 --- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/IPosDevKitPackage.java +++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/IPosDevKitPackage.java @@ -194,6 +194,15 @@ public interface IPosDevKitPackage extends EPackage { */ int MONITORING_REQUEST__SERIALIZATION_TYPE = 10; + /** + * The feature id for the '<em><b>Ref System Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int MONITORING_REQUEST__REF_SYSTEM_ID = 11; + /** * The number of structural features of the '<em>Monitoring Request</em>' class. * <!-- begin-user-doc --> @@ -201,7 +210,7 @@ public interface IPosDevKitPackage extends EPackage { * @generated * @ordered */ - int MONITORING_REQUEST_FEATURE_COUNT = 11; + int MONITORING_REQUEST_FEATURE_COUNT = 12; /** * The number of operations of the '<em>Monitoring Request</em>' class. @@ -630,6 +639,17 @@ public interface IPosDevKitPackage extends EPackage { */ EAttribute getMonitoringRequest_SerializationType(); + /** + * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.MonitoringRequest#getRefSystemId <em>Ref System Id</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Ref System Id</em>'. + * @see ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.MonitoringRequest#getRefSystemId() + * @see #getMonitoringRequest() + * @generated + */ + EAttribute getMonitoringRequest_RefSystemId(); + /** * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.WorldModelUpdateRequest <em>World Model Update Request</em>}'. * <!-- begin-user-doc --> @@ -930,6 +950,14 @@ public interface IPosDevKitPackage extends EPackage { */ EAttribute MONITORING_REQUEST__SERIALIZATION_TYPE = eINSTANCE.getMonitoringRequest_SerializationType(); + /** + * The meta object literal for the '<em><b>Ref System Id</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute MONITORING_REQUEST__REF_SYSTEM_ID = eINSTANCE.getMonitoringRequest_RefSystemId(); + /** * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl.WorldModelUpdateRequestImpl <em>World Model Update Request</em>}' class. * <!-- begin-user-doc --> diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/MonitoringRequest.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/MonitoringRequest.java index 9a723e89d0aad3d8b65975e09bc281db1a45917b..5248044e6d183384bd3aaa64c6dd92cb43e4beac 100644 --- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/MonitoringRequest.java +++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/MonitoringRequest.java @@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.MonitoringRequest#getMonitoringTaskId <em>Monitoring Task Id</em>}</li> * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.MonitoringRequest#getRequestorProtocol <em>Requestor Protocol</em>}</li> * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.MonitoringRequest#getSerializationType <em>Serialization Type</em>}</li> + * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.MonitoringRequest#getRefSystemId <em>Ref System Id</em>}</li> * </ul> * * @see ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage#getMonitoringRequest() @@ -275,4 +276,26 @@ public interface MonitoringRequest extends EObject { */ void setSerializationType(String value); + /** + * Returns the value of the '<em><b>Ref System Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the value of the '<em>Ref System Id</em>' attribute. + * @see #setRefSystemId(String) + * @see ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IPosDevKitPackage#getMonitoringRequest_RefSystemId() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getRefSystemId(); + + /** + * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.MonitoringRequest#getRefSystemId <em>Ref System Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Ref System Id</em>' attribute. + * @see #getRefSystemId() + * @generated + */ + void setRefSystemId(String value); + } // MonitoringRequest diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/IPosDevKitPackageImpl.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/IPosDevKitPackageImpl.java index ea31f9ddd8cd47c9111454e19d83fab3c9663f4b..63e8d3e0b0a8cba5c6d5e05c0ba4aa4da89f3fdf 100644 --- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/IPosDevKitPackageImpl.java +++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/IPosDevKitPackageImpl.java @@ -299,6 +299,15 @@ public class IPosDevKitPackageImpl extends EPackageImpl implements IPosDevKitPac return (EAttribute) monitoringRequestEClass.getEStructuralFeatures().get(10); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getMonitoringRequest_RefSystemId() { + return (EAttribute) monitoringRequestEClass.getEStructuralFeatures().get(11); + } + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -486,6 +495,7 @@ public class IPosDevKitPackageImpl extends EPackageImpl implements IPosDevKitPac createEAttribute(monitoringRequestEClass, MONITORING_REQUEST__MONITORING_TASK_ID); createEAttribute(monitoringRequestEClass, MONITORING_REQUEST__REQUESTOR_PROTOCOL); createEAttribute(monitoringRequestEClass, MONITORING_REQUEST__SERIALIZATION_TYPE); + createEAttribute(monitoringRequestEClass, MONITORING_REQUEST__REF_SYSTEM_ID); worldModelUpdateRequestEClass = createEClass(WORLD_MODEL_UPDATE_REQUEST); @@ -586,6 +596,9 @@ public class IPosDevKitPackageImpl extends EPackageImpl implements IPosDevKitPac initEAttribute(getMonitoringRequest_SerializationType(), theXMLTypePackage.getString(), "serializationType", null, 0, 1, MonitoringRequest.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMonitoringRequest_RefSystemId(), theXMLTypePackage.getString(), "refSystemId", null, 0, 1, + MonitoringRequest.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(worldModelUpdateRequestEClass, WorldModelUpdateRequest.class, "WorldModelUpdateRequest", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/MonitoringRequestImpl.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/MonitoringRequestImpl.java index fcdba3f87d24939bd29d48a4852bd5712f8e6b6c..0c409197c478a5f3200941c073ad3a3d2071410f 100644 --- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/MonitoringRequestImpl.java +++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPosDevKit/impl/MonitoringRequestImpl.java @@ -33,6 +33,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl.MonitoringRequestImpl#getMonitoringTaskId <em>Monitoring Task Id</em>}</li> * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl.MonitoringRequestImpl#getRequestorProtocol <em>Requestor Protocol</em>}</li> * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl.MonitoringRequestImpl#getSerializationType <em>Serialization Type</em>}</li> + * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.impl.MonitoringRequestImpl#getRefSystemId <em>Ref System Id</em>}</li> * </ul> * * @generated @@ -258,6 +259,26 @@ public class MonitoringRequestImpl extends MinimalEObjectImpl.Container implemen */ protected String serializationType = SERIALIZATION_TYPE_EDEFAULT; + /** + * The default value of the '{@link #getRefSystemId() <em>Ref System Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getRefSystemId() + * @generated + * @ordered + */ + protected static final String REF_SYSTEM_ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getRefSystemId() <em>Ref System Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getRefSystemId() + * @generated + * @ordered + */ + protected String refSystemId = REF_SYSTEM_ID_EDEFAULT; + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -518,6 +539,28 @@ public class MonitoringRequestImpl extends MinimalEObjectImpl.Container implemen IPosDevKitPackage.MONITORING_REQUEST__SERIALIZATION_TYPE, oldSerializationType, serializationType)); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getRefSystemId() { + return refSystemId; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setRefSystemId(String newRefSystemId) { + String oldRefSystemId = refSystemId; + refSystemId = newRefSystemId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, IPosDevKitPackage.MONITORING_REQUEST__REF_SYSTEM_ID, + oldRefSystemId, refSystemId)); + } + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -548,6 +591,8 @@ public class MonitoringRequestImpl extends MinimalEObjectImpl.Container implemen return getRequestorProtocol(); case IPosDevKitPackage.MONITORING_REQUEST__SERIALIZATION_TYPE: return getSerializationType(); + case IPosDevKitPackage.MONITORING_REQUEST__REF_SYSTEM_ID: + return getRefSystemId(); } return super.eGet(featureID, resolve, coreType); } @@ -594,6 +639,9 @@ public class MonitoringRequestImpl extends MinimalEObjectImpl.Container implemen case IPosDevKitPackage.MONITORING_REQUEST__SERIALIZATION_TYPE: setSerializationType((String) newValue); return; + case IPosDevKitPackage.MONITORING_REQUEST__REF_SYSTEM_ID: + setRefSystemId((String) newValue); + return; } super.eSet(featureID, newValue); } @@ -639,6 +687,9 @@ public class MonitoringRequestImpl extends MinimalEObjectImpl.Container implemen case IPosDevKitPackage.MONITORING_REQUEST__SERIALIZATION_TYPE: setSerializationType(SERIALIZATION_TYPE_EDEFAULT); return; + case IPosDevKitPackage.MONITORING_REQUEST__REF_SYSTEM_ID: + setRefSystemId(REF_SYSTEM_ID_EDEFAULT); + return; } super.eUnset(featureID); } @@ -677,6 +728,8 @@ public class MonitoringRequestImpl extends MinimalEObjectImpl.Container implemen case IPosDevKitPackage.MONITORING_REQUEST__SERIALIZATION_TYPE: return SERIALIZATION_TYPE_EDEFAULT == null ? serializationType != null : !SERIALIZATION_TYPE_EDEFAULT.equals(serializationType); + case IPosDevKitPackage.MONITORING_REQUEST__REF_SYSTEM_ID: + return REF_SYSTEM_ID_EDEFAULT == null ? refSystemId != null : !REF_SYSTEM_ID_EDEFAULT.equals(refSystemId); } return super.eIsSet(featureID); } @@ -714,6 +767,8 @@ public class MonitoringRequestImpl extends MinimalEObjectImpl.Container implemen result.append(requestorProtocol); result.append(", serializationType: "); result.append(serializationType); + result.append(", refSystemId: "); + result.append(refSystemId); result.append(')'); return result.toString(); } diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/PicklistBin.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/PicklistBin.java index 07ba4069ece38d955dd08f36daed625b5fa37b56..53b25f7e92586e7562b085e9b739ead9670823fa 100644 --- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/PicklistBin.java +++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/PicklistBin.java @@ -52,12 +52,12 @@ public interface PicklistBin extends EObject { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the value of the '<em>Bin Location Number</em>' attribute. - * @see #setBinLocationNumber(int) + * @see #setBinLocationNumber(String) * @see ipos.project.DataModellntegration.iPos_Datamodel.OFBiz.OFBizPackage#getPicklistBin_BinLocationNumber() - * @model dataType="org.eclipse.emf.ecore.xml.type.Int" + * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ - int getBinLocationNumber(); + String getBinLocationNumber(); /** * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.OFBiz.PicklistBin#getBinLocationNumber <em>Bin Location Number</em>}' attribute. @@ -67,7 +67,7 @@ public interface PicklistBin extends EObject { * @see #getBinLocationNumber() * @generated */ - void setBinLocationNumber(int value); + void setBinLocationNumber(String value); /** * Returns the value of the '<em><b>Picklist Items</b></em>' reference list. diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/impl/OFBizPackageImpl.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/impl/OFBizPackageImpl.java index edb2617a588ca0c652653bcaf9990b146f3f9b29..979a182607954971680b43561b8307d673019d10 100644 --- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/impl/OFBizPackageImpl.java +++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/impl/OFBizPackageImpl.java @@ -417,8 +417,8 @@ public class OFBizPackageImpl extends EPackageImpl implements OFBizPackage { initEAttribute(getPicklistBin_PicklistId(), theXMLTypePackage.getString(), "picklistId", null, 0, 1, PicklistBin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getPicklistBin_BinLocationNumber(), theXMLTypePackage.getInt(), "binLocationNumber", null, 0, 1, - PicklistBin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + initEAttribute(getPicklistBin_BinLocationNumber(), theXMLTypePackage.getString(), "binLocationNumber", null, 0, + 1, PicklistBin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getPicklistBin_PicklistItems(), this.getPicklistItem(), null, "picklistItems", null, 0, -1, PicklistBin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/impl/PicklistBinImpl.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/impl/PicklistBinImpl.java index d80fd6b8cbacff23aab92660e33433e8afa97ca9..87d4dfad3c2c3609fcb572768e0c1106d4e66e16 100644 --- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/impl/PicklistBinImpl.java +++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OFBiz/impl/PicklistBinImpl.java @@ -63,7 +63,7 @@ public class PicklistBinImpl extends MinimalEObjectImpl.Container implements Pic * @generated * @ordered */ - protected static final int BIN_LOCATION_NUMBER_EDEFAULT = 0; + protected static final String BIN_LOCATION_NUMBER_EDEFAULT = null; /** * The cached value of the '{@link #getBinLocationNumber() <em>Bin Location Number</em>}' attribute. @@ -73,7 +73,7 @@ public class PicklistBinImpl extends MinimalEObjectImpl.Container implements Pic * @generated * @ordered */ - protected int binLocationNumber = BIN_LOCATION_NUMBER_EDEFAULT; + protected String binLocationNumber = BIN_LOCATION_NUMBER_EDEFAULT; /** * The cached value of the '{@link #getPicklistItems() <em>Picklist Items</em>}' reference list. @@ -131,7 +131,7 @@ public class PicklistBinImpl extends MinimalEObjectImpl.Container implements Pic * <!-- end-user-doc --> * @generated */ - public int getBinLocationNumber() { + public String getBinLocationNumber() { return binLocationNumber; } @@ -140,8 +140,8 @@ public class PicklistBinImpl extends MinimalEObjectImpl.Container implements Pic * <!-- end-user-doc --> * @generated */ - public void setBinLocationNumber(int newBinLocationNumber) { - int oldBinLocationNumber = binLocationNumber; + public void setBinLocationNumber(String newBinLocationNumber) { + String oldBinLocationNumber = binLocationNumber; binLocationNumber = newBinLocationNumber; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, OFBizPackage.PICKLIST_BIN__BIN_LOCATION_NUMBER, @@ -192,7 +192,7 @@ public class PicklistBinImpl extends MinimalEObjectImpl.Container implements Pic setPicklistId((String) newValue); return; case OFBizPackage.PICKLIST_BIN__BIN_LOCATION_NUMBER: - setBinLocationNumber((Integer) newValue); + setBinLocationNumber((String) newValue); return; case OFBizPackage.PICKLIST_BIN__PICKLIST_ITEMS: getPicklistItems().clear(); @@ -234,7 +234,8 @@ public class PicklistBinImpl extends MinimalEObjectImpl.Container implements Pic case OFBizPackage.PICKLIST_BIN__PICKLIST_ID: return PICKLIST_ID_EDEFAULT == null ? picklistId != null : !PICKLIST_ID_EDEFAULT.equals(picklistId); case OFBizPackage.PICKLIST_BIN__BIN_LOCATION_NUMBER: - return binLocationNumber != BIN_LOCATION_NUMBER_EDEFAULT; + return BIN_LOCATION_NUMBER_EDEFAULT == null ? binLocationNumber != null + : !BIN_LOCATION_NUMBER_EDEFAULT.equals(binLocationNumber); case OFBizPackage.PICKLIST_BIN__PICKLIST_ITEMS: return picklistItems != null && !picklistItems.isEmpty(); } diff --git a/src/main/java/ipos/project/MainApp.java b/src/main/java/ipos/project/MainApp.java index 7c2839fa7e4fea9b3d77958567dea593dda9e05f..60cd9083d7f8eea83f16f094a7e433cd9f8a3b4f 100644 --- a/src/main/java/ipos/project/MainApp.java +++ b/src/main/java/ipos/project/MainApp.java @@ -25,9 +25,11 @@ public class MainApp { public static final String TESTDATA_QUERY = "./testdata_raw_query.txt"; public static final String TESTDATA_OP = "./testdata_raw_orderpicker.txt"; public static final String TESTDATA_OP_EVTS = "testdata_raw_orderpicker_posEvts.txt"; + public static final String TESTDATA_SDF = "testdata_raw_sdf.txt"; public static final String COMMAND_INDFRO = "indfro testdata"; // Industrierobotik_Frontend public static final String COMMAND_OP = "oppl testdata"; public static final String COMMAND_OP_EVTS = "opevts testdata"; + public static final String COMMAND_SDF = "sdf testdata"; public static final String COMMAND_EXIT = "exit"; public static final String COMMAND_HELP = "help"; public static final String COMMAND_QUERY = "query"; @@ -56,6 +58,7 @@ public class MainApp { case COMMAND_EXIT : proceed = false; break; case COMMAND_HELP: printCommands(); break; case COMMAND_INDFRO: GenericSensorValueProcessor.processTestData(TESTDATA_INDFRO); break; + case COMMAND_SDF: GenericSensorValueProcessor.processTestData(TESTDATA_SDF); break; case COMMAND_OP : OFBizOrderPicker.processPicklistTestData(TESTDATA_OP); break; case COMMAND_OP_EVTS: OFBizOrderPicker.processPosEvtTestData(TESTDATA_OP_EVTS); break; case COMMAND_QUERY : SimpleSceneIntegration.handleMessageFile(TESTDATA_QUERY); break; @@ -97,6 +100,7 @@ public class MainApp { LOG.info("SHELL:Testdata:"); LOG.info("SHELL:---------"); LOG.info("SHELL:" + COMMAND_INDFRO); + LOG.info("SHELL:" + COMMAND_SDF); LOG.info("SHELL:" + COMMAND_OP); LOG.info("SHELL:" + COMMAND_OP_EVTS); LOG.info("SHELL:" + COMMAND_QUERY); diff --git a/src/main/java/ipos/project/UseCaseController/PositionMonitoring.java b/src/main/java/ipos/project/UseCaseController/PositionMonitoring.java index 96e70792801ba9ca113125b11e388c01ca337be5..c12e296302dd8cdc0b79e8c1d03f6a040578540f 100644 --- a/src/main/java/ipos/project/UseCaseController/PositionMonitoring.java +++ b/src/main/java/ipos/project/UseCaseController/PositionMonitoring.java @@ -64,6 +64,10 @@ public class PositionMonitoring { PositionEvent positionEvent = null; try { positionEvent = Triangulation.update(uwbRawDataEvent); + LOG.info("OP:"); + LOG.info("OP:"); + LOG.info("OP:"); + LOG.info("OP:----PositionMonitoring--------------------------"); LOG.info("OP: position: " + logPosition(positionEvent)); } catch (ParseException e) { @@ -388,7 +392,7 @@ public class PositionMonitoring { List<ZoneDescriptor> zoneDescriptors = new LinkedList<>(); for (String zoneId : filteringResult.getMatchingPositionConditionCellIds()){ ZoneDescriptor zoneDescriptor = modelFactory.createZoneDescriptor(); - LOG.info("OP: zoneId: " + zoneId); + //LOG.info("OP: zoneId: " + zoneId); zoneDescriptor.setZoneId(zoneId); if(isEntryNotification(filteringResult, zoneId)) { zoneDescriptor.setNotificationType(PositionMonitoring.ENTRY_NOTIFICATION_TYPE); diff --git a/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPicker.java b/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPicker.java index 3c36e1cdb2fd7635d0119003b0618d2f4c12d8a3..cbb7c705bc45bdef1ae08e0311e788e4068d2a94 100644 --- a/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPicker.java +++ b/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPicker.java @@ -25,12 +25,12 @@ import java.io.File; */ @Component public class OFBizOrderPicker { - public static final String OP_MONITORINGREQUEST = "{\"monitoringRequests\": [{\"frameIds\": [\"box_1\", \"box_2\", \"box_3\", \"box_4\", \"box_5\", \"box_6\", \"shipmentBin_1\", \"shipmentBin_2\", \"shipmentBin_3\"], \"monitoringTaskId\": \"" + OFBizOrderPicker.TOPIC_POSITION_EVENT + "\", \"serializationType\": \"json\"}]}"; + public static final String OP_MONITORINGREQUEST = "{\"monitoringRequests\": [{\"frameIds\": [\"box_1\", \"box_2\", \"box_3\", \"shipmentBin_1\", \"shipmentBin_2\"], \"monitoringTaskId\": \"" + OFBizOrderPicker.TOPIC_POSITION_EVENT + "\", \"serializationType\": \"json\"}]}"; public static final String OP_PICKER_ROLE_TYPE = "PICKER"; public static final String TOPIC_POSITION_EVENT = "RobolabMonitoringOPExtension"; public static final String TOPIC_FRONTEND = "ipos/client/tableWrapper"; - public static final String PREFIX_SHIPMENTBIN = "shipmentBin_"; - public static final String PREFIX_INVENTORYITEM = "box_"; + public static final String INVENTORYITEM_TYPE_NAME = "inventory"; + public static final String SHIPMENTBIN_TYPE_NAME = "shipment"; private static org.apache.logging.log4j.Logger LOG = LogManager.getLogger(); static IPosExtension ofbizOpIposExt = new OFBizOrderPickerExt(); diff --git a/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPickerExt.java b/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPickerExt.java index 2f0aea9ec3e2ee247f3120bce671e6f64f335fe7..2d53fdb975c2b9dd5fd35e999c14eaa8936b38e7 100644 --- a/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPickerExt.java +++ b/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPickerExt.java @@ -4,6 +4,7 @@ import com.google.protobuf.InvalidProtocolBufferException; import ipos.models.SimpleScene; import ipos.project.DataModellntegration.iPos_Datamodel.IPosDevKit.IposPositionEvent; import ipos.project.DataModellntegration.iPos_Datamodel.OFBiz.Picklist; +import ipos.project.DataModellntegration.iPos_Datamodel.Point3D; import ipos.project.DataModellntegration.iPos_Datamodel.ZoneDescriptor; import ipos.project.devkit.eca.zseq.ZoneSequenceArgs; import ipos.project.devkit.iposext.IPosArguments; @@ -40,7 +41,9 @@ public class OFBizOrderPickerExt extends IPosExtension { @Override public void handlePositionEvent(IposPositionEvent posEvent, IPosArguments.HandlePosEventConf _posEvtConf) { - LOG.info("OP: Received IposPositionEvent for agent " + posEvent.getAgentId() + ". Zones: " + extractZoneIdsAsString(posEvent.getZoneDescriptors())); + LOG.info("OP:"); + LOG.info("OP:----OFBizOrderPickerExt--------------------------"); + LOG.info("OP: Received IposPositionEvent for agent " + posEvent.getAgentId() + ". Zones: " + extractZoneIdsAsString(posEvent.getZoneDescriptors()) + "; position: " + logPoint((Point3D) posEvent.getPosition().getPoint())); try { // String picklistId = readPicklistId(_posEvtConf); // SeqPicklistRule spRule = getEcaRule(picklistId); @@ -62,6 +65,11 @@ public class OFBizOrderPickerExt extends IPosExtension { return; } } + + private String logPoint(Point3D point) { + return "(x: " + point.getX() + ", y: " + point.getY() + ", z: " + point.getZ() + ")"; + } + /* private void handleCefResult(String picklistId, CEFResult cefResult) { if(cefResult.isPosEventTriggeredStateChange()){ diff --git a/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPickerTrans.java b/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPickerTrans.java index 67d734b934cab3c78ccf975420d1f8a352504b92..6f353cc06c6a58cd18f2990a5114d4d7ffee734e 100644 --- a/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPickerTrans.java +++ b/src/main/java/ipos/project/iposextension/orderpicker/OFBizOrderPickerTrans.java @@ -131,7 +131,7 @@ public class OFBizOrderPickerTrans { InventoryItem inventoryItem = picklistItem.getInventoryItem(); String productId = inventoryItem.getProductId(); String inventoryItem_Soll = inventoryItem.getContainerId(); - int shipmentBinNr_Soll = picklistBin.getBinLocationNumber(); + String shipmentBinNr_Soll = picklistBin.getBinLocationNumber(); FEInitRow feInitRow = new FEInitRow(-1, productId, inventoryItem_Soll, shipmentBinNr_Soll); feInitRows.add(feInitRow); } @@ -156,7 +156,7 @@ public class OFBizOrderPickerTrans { private static ZoneDescriptor extractShipmentBinZoneDescFromRow(FEInitRow feInitRow) { ZoneDescriptor shipBin_zoneDescriptor = modelFactory.createZoneDescriptor(); - shipBin_zoneDescriptor.setZoneId(OFBizOrderPicker.PREFIX_SHIPMENTBIN + feInitRow.getShipmentBinNr_Soll()); + shipBin_zoneDescriptor.setZoneId(feInitRow.getShipmentBinNr_Soll()); return shipBin_zoneDescriptor; } diff --git a/src/main/java/ipos/project/iposextension/orderpicker/eca/SeqPicklistCondition.java b/src/main/java/ipos/project/iposextension/orderpicker/eca/SeqPicklistCondition.java index 1a68ecb7964bd279805845edeb3568b77dc66436..ff5b8327d6614152fd72cb89e152cec41e8a345a 100644 --- a/src/main/java/ipos/project/iposextension/orderpicker/eca/SeqPicklistCondition.java +++ b/src/main/java/ipos/project/iposextension/orderpicker/eca/SeqPicklistCondition.java @@ -4,6 +4,7 @@ import ipos.project.DataModellntegration.iPos_Datamodel.ZoneDescriptor; import ipos.project.devkit.eca.zseq.StageChangeAction; import ipos.project.devkit.eca.zseq.ZoneSequenceCondition; import ipos.project.devkit.eca.zseq.ZoneSequenceStage; +import ipos.project.iposextension.orderpicker.OFBizOrderPicker; public class SeqPicklistCondition extends ZoneSequenceCondition { @@ -18,11 +19,14 @@ public class SeqPicklistCondition extends ZoneSequenceCondition { public StageChangeAction evaluateStageChangeIntoAction(ZoneDescriptor zoneDescriptor){ timesCalled++; int index = (int) Math.ceil(timesCalled/2.0); // number of the line of the frontend-app table should be updated. Each second StageChange changes the line number - ZoneSequenceStage nextStage = currentStage.getNextStage(); // assumption: ZoneSequenceRule::isApplicable rejects the event if the corresponding picklist has been finished (when + String inventoryOrShipment = (timesCalled%2.0 == 1.0) ? OFBizOrderPicker.INVENTORYITEM_TYPE_NAME : OFBizOrderPicker.SHIPMENTBIN_TYPE_NAME; // uneven -> inventoryItem, even -> shipmentBin + + ZoneSequenceStage nextStage = currentStage.getNextStage(); // assumption: ZoneSequenceRule::isApplicable rejects the event if the corresponding picklist has been finished String nextItemId = nextStage.getEventDescriptors().get(0).getZoneId(); boolean isCorrect = zoneDescriptor.getZoneId().equals(nextItemId); String itemId = zoneDescriptor.getZoneId(); - UpdateFrontendAction updateFrontendAction = new UpdateFrontendAction(index, isCorrect, itemId); + + UpdateFrontendAction updateFrontendAction = new UpdateFrontendAction(index, isCorrect, itemId, inventoryOrShipment); return updateFrontendAction; } diff --git a/src/main/java/ipos/project/iposextension/orderpicker/eca/UpdateFrontendAction.java b/src/main/java/ipos/project/iposextension/orderpicker/eca/UpdateFrontendAction.java index 7b8fc1a5c6b0959d1bfe99ca515d803a0a929dd7..49b8c3b90a6362fa6d6c5f7c5c48526a613db7d4 100644 --- a/src/main/java/ipos/project/iposextension/orderpicker/eca/UpdateFrontendAction.java +++ b/src/main/java/ipos/project/iposextension/orderpicker/eca/UpdateFrontendAction.java @@ -2,48 +2,47 @@ package ipos.project.iposextension.orderpicker.eca; import ipos.models.OFBizOrderpicker; import ipos.project.devkit.eca.zseq.StageChangeAction; -import ipos.project.devkit.utility.ExternalPubServiceImpl; import ipos.project.devkit.utility.ProtoJsonMap; import ipos.project.iposextension.orderpicker.OFBizOrderPicker; import ipos.project.iposextension.orderpicker.frontend.FETransformer; import ipos.project.iposextension.orderpicker.frontend.FEUpdateInventoryItem; import ipos.project.iposextension.orderpicker.frontend.FEUpdateShipmentBin; import org.apache.logging.log4j.LogManager; -import org.springframework.beans.factory.annotation.Autowired; public class UpdateFrontendAction extends StageChangeAction { private static org.apache.logging.log4j.Logger LOG = LogManager.getLogger(); private final int index; private final boolean isCorrect; private final String itemId; + private final String inventoryOrShipment; - // @Autowired + // @Autowired // public static ExternalPubServiceImpl mqttService; - public UpdateFrontendAction(int index, boolean isCorrect, String itemId) { + public UpdateFrontendAction(int index, boolean isCorrect, String itemId, String inventoryOrShipment) { super(); this.index = index; this.isCorrect = isCorrect; this.itemId = itemId; + this.inventoryOrShipment = inventoryOrShipment; } @Override public void execute() { - if (isInventoryItem(this.itemId)){ + if (shouldBeWrittenInInventoryItemColumn(inventoryOrShipment)){ FEUpdateInventoryItem feUpdInvItem = new FEUpdateInventoryItem(index, isCorrect, itemId); OFBizOrderpicker.FEndUpdateInventoryItem proto_invItem = FETransformer.transformIntoProto(feUpdInvItem); OFBizOrderpicker.FEndWrapper proto_invItemWrapper = FETransformer.putIntoWrapper(proto_invItem); String jsonString = ProtoJsonMap.toJson(proto_invItemWrapper); OFBizOrderPicker.mqttService.publish(OFBizOrderPicker.TOPIC_FRONTEND, jsonString, 0, false); - LOG.info("OP: publishing JSON-InventoryItem mqtt update-message to OP-Frontend-app:" + jsonString + " on topic: " + OFBizOrderPicker.TOPIC_FRONTEND + ". isCorrect (proto): " + proto_invItem.getIsCorrect()); - }else if(isShipmentBin(this.itemId)) { - int shipmentBinNr = extractShipmentBinNr(this.itemId); - FEUpdateShipmentBin feUpdShipBinNr = new FEUpdateShipmentBin(index, isCorrect, shipmentBinNr); + LOG.info("OP: publishing JSON-InventoryItem mqtt update-message to OP-Frontend-app:" + jsonString + " on topic: " + OFBizOrderPicker.TOPIC_FRONTEND + ". isCorrect (proto): " + proto_invItem.getInventoryIsCorrect()); + }else if(shouldBeWrittenInShipmentBinColumn(inventoryOrShipment)) { + FEUpdateShipmentBin feUpdShipBinNr = new FEUpdateShipmentBin(index, isCorrect, itemId); OFBizOrderpicker.FEndUpdateShipmentBin proto_shipBin = FETransformer.transformIntoProto(feUpdShipBinNr); OFBizOrderpicker.FEndWrapper proto_shipBinWrapper = FETransformer.putIntoWrapper(proto_shipBin); String jsonString = ProtoJsonMap.toJson(proto_shipBinWrapper); OFBizOrderPicker.mqttService.publish(OFBizOrderPicker.TOPIC_FRONTEND, jsonString, 0, false); - LOG.info("OP: publishing JSON-ShipmentBin mqtt update-message to OP-Frontend-app:" + jsonString + " on topic: " + OFBizOrderPicker.TOPIC_FRONTEND+ ". isCorrect (proto): " + proto_shipBin.getIsCorrect()); + LOG.info("OP: publishing JSON-ShipmentBin mqtt update-message to OP-Frontend-app:" + jsonString + " on topic: " + OFBizOrderPicker.TOPIC_FRONTEND+ ". isCorrect (proto): " + proto_shipBin.getShipmentIsCorrect()); } else { LOG.info("OP: Warning: Could not react to StageChange, as vessel-type could not be determined"); return; @@ -54,11 +53,11 @@ public class UpdateFrontendAction extends StageChangeAction { return Integer.parseInt(itemId.split("_")[1]); } - private boolean isShipmentBin(String itemId) { - return itemId.startsWith(OFBizOrderPicker.PREFIX_SHIPMENTBIN); + private boolean shouldBeWrittenInShipmentBinColumn(String itemId) { + return itemId.equals(OFBizOrderPicker.SHIPMENTBIN_TYPE_NAME); } - private boolean isInventoryItem(String itemId) { - return itemId.startsWith(OFBizOrderPicker.PREFIX_INVENTORYITEM); + private boolean shouldBeWrittenInInventoryItemColumn(String itemId) { + return itemId.equals(OFBizOrderPicker.INVENTORYITEM_TYPE_NAME); } } diff --git a/src/main/java/ipos/project/iposextension/orderpicker/frontend/FEInitRow.java b/src/main/java/ipos/project/iposextension/orderpicker/frontend/FEInitRow.java index cc6da5856f24f8d60e419f660b1427a1750ddc3f..793adc3b0ea9a3e72a4fb8eab5907cb216610572 100644 --- a/src/main/java/ipos/project/iposextension/orderpicker/frontend/FEInitRow.java +++ b/src/main/java/ipos/project/iposextension/orderpicker/frontend/FEInitRow.java @@ -1,7 +1,7 @@ package ipos.project.iposextension.orderpicker.frontend; public class FEInitRow { - public FEInitRow(int index, String productId, String inventoryItem_Soll, int shipmentBinNr_Soll) { + public FEInitRow(int index, String productId, String inventoryItem_Soll, String shipmentBinNr_Soll) { this.index = index; this.productId = productId; this.inventoryItem_Soll = inventoryItem_Soll; @@ -11,7 +11,7 @@ public class FEInitRow { int index; String productId; String inventoryItem_Soll; - int shipmentBinNr_Soll; + String shipmentBinNr_Soll; public int getIndex() { return index; @@ -25,7 +25,7 @@ public class FEInitRow { return inventoryItem_Soll; } - public int getShipmentBinNr_Soll() { + public String getShipmentBinNr_Soll() { return shipmentBinNr_Soll; } diff --git a/src/main/java/ipos/project/iposextension/orderpicker/frontend/FETransformer.java b/src/main/java/ipos/project/iposextension/orderpicker/frontend/FETransformer.java index a79a1d85af585034ec44cf38e7246241b1f703c9..63c8ce3e7fb45cfade19ca39aaca486318a6eb52 100644 --- a/src/main/java/ipos/project/iposextension/orderpicker/frontend/FETransformer.java +++ b/src/main/java/ipos/project/iposextension/orderpicker/frontend/FETransformer.java @@ -6,7 +6,7 @@ public class FETransformer { public static OFBizOrderpicker.FEndUpdateInventoryItem transformIntoProto(FEUpdateInventoryItem feUpdInvItem) { OFBizOrderpicker.FEndUpdateInventoryItem.Builder proto_invItem = OFBizOrderpicker.FEndUpdateInventoryItem.newBuilder(); proto_invItem.setIndex(feUpdInvItem.getIndex()); - proto_invItem.setIsCorrect(feUpdInvItem.isCorrect()); + proto_invItem.setInventoryIsCorrect(feUpdInvItem.isCorrect()); proto_invItem.setInventoryItemIst(feUpdInvItem.getInventoryItem_Ist()); return proto_invItem.build(); } @@ -14,8 +14,8 @@ public class FETransformer { public static OFBizOrderpicker.FEndUpdateShipmentBin transformIntoProto(FEUpdateShipmentBin feUpdShipBinNr) { OFBizOrderpicker.FEndUpdateShipmentBin.Builder proto_shipBin = OFBizOrderpicker.FEndUpdateShipmentBin.newBuilder(); proto_shipBin.setIndex(feUpdShipBinNr.getIndex()); - proto_shipBin.setIsCorrect(feUpdShipBinNr.isCorrect()); - proto_shipBin.setShipmentBinNrIst(feUpdShipBinNr.getShipmentBinNr_Ist()); + proto_shipBin.setShipmentIsCorrect(feUpdShipBinNr.isCorrect()); + proto_shipBin.setShipmentBinNrIst(feUpdShipBinNr.getShipmentBinNrIstColumn()); return proto_shipBin.build(); } diff --git a/src/main/java/ipos/project/iposextension/orderpicker/frontend/FEUpdateShipmentBin.java b/src/main/java/ipos/project/iposextension/orderpicker/frontend/FEUpdateShipmentBin.java index 2c53c92b55ea9426b836a8229c3c0e13bb8b8825..8c7171cd4c400ccbba67539cf9f00369915f20e0 100644 --- a/src/main/java/ipos/project/iposextension/orderpicker/frontend/FEUpdateShipmentBin.java +++ b/src/main/java/ipos/project/iposextension/orderpicker/frontend/FEUpdateShipmentBin.java @@ -1,14 +1,14 @@ package ipos.project.iposextension.orderpicker.frontend; public class FEUpdateShipmentBin extends FEUpdateRow{ - int shipmentBinNr_Ist; + String shipmentBinNrIstColumn; - public FEUpdateShipmentBin(int index, boolean isCorrect, int shipmentBinNr_Ist) { + public FEUpdateShipmentBin(int index, boolean isCorrect, String shipmentBinNrIst) { super(index, isCorrect); - this.shipmentBinNr_Ist = shipmentBinNr_Ist; + this.shipmentBinNrIstColumn = shipmentBinNrIst; } - public int getShipmentBinNr_Ist() { - return shipmentBinNr_Ist; + public String getShipmentBinNrIstColumn() { + return shipmentBinNrIstColumn; } } diff --git a/testdata_raw_indfro.txt b/testdata_raw_indfro.txt index daeb3592d38d7ebb30777617d105fb55723f6825..10c650b99cdce5501ed2ceb18a0d381f710c4754 100644 --- a/testdata_raw_indfro.txt +++ b/testdata_raw_indfro.txt @@ -1,5 +1,5 @@ {"sensorPositionEvent": [{"sensorId": "UWB_1", "position": {"refSystemId": "ROOT", "point": {"x": 3.0,"y": 1.5,"z": 3.0}, "accuracy": 10.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "lastPosUpdate": "2021-10-14T19:32:20+00:00"}]} -{"sensorPositionEvent": [{"sensorId": "UWB_1", "position": {"refSystemId": "ROOT", "point": {"x": 3.0,"y": 4.5,"z": 3.0}, "accuracy": 10.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "lastPosUpdate": "2021-10-14T19:32:21+00:00"}]} +{"sensorPositionEvent": [{"sensorId": "UWB_1", "position": {"refSystemId": "CETI_ROOT", "point": {"x": 3.0,"y": 4.5,"z": 3.0}, "accuracy": 10.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "lastPosUpdate": "2021-10-14T19:32:21+00:00"}]} {"sensorPositionEvent": [{"sensorId": "UWB_1", "position": {"refSystemId": "ROOT", "point": {"x": -3.0,"y": 4.5,"z": 3.0}, "accuracy": 10.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "lastPosUpdate": "2021-10-14T19:32:22+00:00"}]} {"sensorPositionEvent": [{"sensorId": "UWB_1", "position": {"refSystemId": "ROOT", "point": {"x": 3.0,"y": 1.5,"z": 3.0}, "accuracy": 10.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "lastPosUpdate": "2021-10-14T19:32:23+00:00"}]} {"nfcRawDataEvent" : [ {"timestamp" : "2021-10-14T19:33:24+00:00", "tagId": "83221710", "type": "RFID", "scannerId": "98:CD:AC:26:2D:18"} ] } diff --git a/testdata_raw_orderpicker.txt b/testdata_raw_orderpicker.txt index 52b48e1e1c280351b6241452eb24a42e7eb123c4..ed1e4b2d440ca276d32874b8a6225743527272a4 100644 --- a/testdata_raw_orderpicker.txt +++ b/testdata_raw_orderpicker.txt @@ -1 +1 @@ -{"picklists" : [{ "picklistId" : "picklist_1", "picklistRoles" : [ { "picklistId" : "Picklist_1", "partyId" : "Employee_1", "roleTypeId" : "PICKER" } ], "picklistBins" : [ { "picklistId" : "picklist_1", "binLocationNumber" : 4, "picklistItems" : [ { "inventoryItem" : { "inventoryItemId" : "invit1", "containerId" : "box_1", "productId" : "Rasierer" } } ] }, { "picklistId" : "picklist_1", "binLocationNumber" : 3, "picklistItems" : [ { "inventoryItem" : { "inventoryItemId" : "invit3", "containerId" : "box_3", "productId" : "Smartphone" } }, { "inventoryItem" : { "inventoryItemId" : "invit5", "containerId" : "box_5", "productId" : "Bohrmaschine" } }, { "inventoryItem" : { "inventoryItemId" : "invit2", "containerId" : "box_2", "productId" : "Hammer" } } ] } ] }]} \ No newline at end of file +{"picklists" : [{ "picklistId" : "picklist_1", "picklistRoles" : [ { "picklistId" : "Picklist_1", "partyId" : "Employee_1", "roleTypeId" : "PICKER" } ], "picklistBins" : [ { "picklistId" : "picklist_1", "binLocationNumber" : "shipmentBin_1", "picklistItems" : [ { "inventoryItem" : { "inventoryItemId" : "invit1", "containerId" : "box_1", "productId" : "blau" } } ] }, { "picklistId" : "picklist_1", "binLocationNumber" : "shipmentBin_2", "picklistItems" : [ { "inventoryItem" : { "inventoryItemId" : "invit3", "containerId" : "box_2", "productId" : "grün" } }, { "inventoryItem" : { "inventoryItemId" : "invit3", "containerId" : "box_3", "productId" : "rot" } } ] } ] }]} \ No newline at end of file diff --git a/testdata_raw_orderpicker_posEvts.txt b/testdata_raw_orderpicker_posEvts.txt index 87e7965fcde43376c66ebdebd8e88f9f8883bf96..865e787eb14d65ebe4c38bcaccddbaa9dbacf94d 100644 --- a/testdata_raw_orderpicker_posEvts.txt +++ b/testdata_raw_orderpicker_posEvts.txt @@ -1,22 +1,23 @@ {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_1", "notificationType" : "undefined"}] } ]} {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_1", "notificationType" : "undefined"}] } ]} {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_1", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_5", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_5", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_5", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_4", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_4", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_4", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_3", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_3", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_3", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_3", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_1", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_1", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_1", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_2", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_2", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_2", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_3", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_3", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_3", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_3", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_3", "notificationType" : "undefined"}] } ]} {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_5", "notificationType" : "undefined"}] } ]} {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_5", "notificationType" : "undefined"}] } ]} {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_5", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_3", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_3", "notificationType" : "undefined"}] } ]} -{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_3", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_2", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_2", "notificationType" : "undefined"}] } ]} +{"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "shipmentBin_2", "notificationType" : "undefined"}] } ]} {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_2", "notificationType" : "undefined"}] } ]} {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_2", "notificationType" : "undefined"}] } ]} {"objects" : [ { "id" : "Employee_1", "sensorId" : "UWB_1", "type" : "HUMAN", "sensorType" : "UWB", "position" : {"refSystemId": "ROOT", "point": {"x": 0,"y": 0,"z": 0.97}, "accuracy": 0.01}, "orientation" : {"x": 0.0,"y": 0.0,"z": 0.0, "w": 0.0}, "lastPosUpdate" : "2021-10-14T19:32:20+00:00", "zoneDescriptors" : [{"zoneId" : "box_2", "notificationType" : "undefined"}] } ]} diff --git a/testdata_raw_orderpicker_readable.txt b/testdata_raw_orderpicker_readable.txt index c95c5b661920f9a43e64166a36b4b461369a28b7..a1e14d7c81033012e411da5e6a013c546d3aa686 100644 --- a/testdata_raw_orderpicker_readable.txt +++ b/testdata_raw_orderpicker_readable.txt @@ -10,50 +10,40 @@ "picklistBins" : [ { "picklistId" : "picklist_1", - "binLocationNumber" : 4, + "binLocationNumber" : "shipmentBin_1", "picklistItems" : [ { "inventoryItem" : { "inventoryItemId" : "invit1", "containerId" : "box_1", - "productId" : "Rasierer" + "productId" : "blau" } } ] }, { "picklistId" : "picklist_1", - "binLocationNumber" : 3, + "binLocationNumber" : "shipmentBin_2", "picklistItems" : [ { "inventoryItem" : { "inventoryItemId" : "invit3", - "containerId" : "box_3", - "productId" : "Smartphone" - } - }, - { - "inventoryItem" : - { - "inventoryItemId" : "invit5", - "containerId" : "box_5", - "productId" : "Bohrmaschine" + "containerId" : "box_2", + "productId" : "grün" } }, { - "inventoryItem" : + "inventoryItem" : { - "inventoryItemId" : "invit2", - "containerId" : "box_2", - "productId" : "Hammer" + "inventoryItemId" : "invit3", + "containerId" : "box_3", + "productId" : "rot" } } ] - } - + } ] - - }]} \ No newline at end of file + }]} \ No newline at end of file diff --git a/testdata_raw_sdf.txt b/testdata_raw_sdf.txt index 4c97ebf4eb56221871137d006085b24dd2bc03fa..2362c025eea8b4aa9b7687cb1502d7ec33d18a51 100644 --- a/testdata_raw_sdf.txt +++ b/testdata_raw_sdf.txt @@ -1,3 +1,4 @@ {"sensorPositionEvent": [{"sensorId": "UWB_1", "position": {"refSystemId": "ROOT", "point": {"x": 3.0,"y": 1.5,"z": 3.0}, "accuracy": 1.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "lastPosUpdate": "2021-10-14T19:32:20+00:00"}]} {"nfcRawDataEvent" : [ {"timestamp" : "2021-10-14T19:33:20+00:00", "tagId": "83221710", "type": "RFID", "scannerId": "98:CD:AC:26:2D:18"} ] } +{"nfcRawDataEvent" : [ {"timestamp" : "2021-10-14T19:33:20+00:00", "tagId": "31762128", "type": "RFID", "scannerId": "98:CD:AC:26:2D:18"} ] } {"sensorPositionEvent": [{"sensorId": "UWB_1", "position": {"refSystemId": "ROOT", "point": {"x": 3.0,"y": 1.5,"z": 3.0}, "accuracy": 1.0}, "orientation": {"x": 1.0,"y": 0.5,"z": 1.0, "w": 1.5}, "lastPosUpdate": "2021-10-14T19:34:20+00:00"}]} \ No newline at end of file