added gatewayId to metadata in ENTITY_CREATED event msg

6 years ago · 14039d9151
1 changed files with 4 additions and 1 deletions
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
@ -139,7 +139,10 @@ public class DefaultTransportApiService implements TransportApiService {
                    deviceStateService.onDeviceAdded(device);

                    TbMsgMetaData metaData = new TbMsgMetaData();
-                    metaData.putValue("customerId", device.getCustomerId().toString());
+                    if (customerId != null && !customerId.isNullUid()) {
+                        metaData.putValue("customerId", customerId.toString());
+                    }
+                    metaData.putValue("gatewayId", gatewayId.toString());

                    DeviceId deviceId = device.getId();
                    ObjectNode entityNode = mapper.valueToTree(device);