|
|
|
@ -82,7 +82,7 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor { |
|
|
|
private static final ReentrantLock deviceCreationLock = new ReentrantLock(); |
|
|
|
|
|
|
|
public ListenableFuture<Void> processDeviceFromEdge(TenantId tenantId, Edge edge, DeviceUpdateMsg deviceUpdateMsg) { |
|
|
|
log.trace("[{}] onDeviceUpdate [{}] from edge [{}]", tenantId, deviceUpdateMsg, edge.getName()); |
|
|
|
log.trace("[{}] processDeviceFromEdge [{}] from edge [{}]", tenantId, deviceUpdateMsg, edge.getName()); |
|
|
|
switch (deviceUpdateMsg.getMsgType()) { |
|
|
|
case ENTITY_CREATED_RPC_MESSAGE: |
|
|
|
String deviceName = deviceUpdateMsg.getName(); |
|
|
|
@ -155,7 +155,7 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor { |
|
|
|
} |
|
|
|
|
|
|
|
public ListenableFuture<Void> processDeviceCredentialsFromEdge(TenantId tenantId, DeviceCredentialsUpdateMsg deviceCredentialsUpdateMsg) { |
|
|
|
log.debug("Executing onDeviceCredentialsUpdate, deviceCredentialsUpdateMsg [{}]", deviceCredentialsUpdateMsg); |
|
|
|
log.debug("[{}] Executing processDeviceCredentialsFromEdge, deviceCredentialsUpdateMsg [{}]", tenantId, deviceCredentialsUpdateMsg); |
|
|
|
DeviceId deviceId = new DeviceId(new UUID(deviceCredentialsUpdateMsg.getDeviceIdMSB(), deviceCredentialsUpdateMsg.getDeviceIdLSB())); |
|
|
|
ListenableFuture<Device> deviceFuture = deviceService.findDeviceByIdAsync(tenantId, deviceId); |
|
|
|
return Futures.transform(deviceFuture, device -> { |
|
|
|
@ -201,9 +201,7 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor { |
|
|
|
device.setCustomerId(getCustomerId(deviceUpdateMsg)); |
|
|
|
Optional<DeviceData> deviceDataOpt = |
|
|
|
dataDecodingEncodingService.decode(deviceUpdateMsg.getDeviceDataBytes().toByteArray()); |
|
|
|
if (deviceDataOpt.isPresent()) { |
|
|
|
device.setDeviceData(deviceDataOpt.get()); |
|
|
|
} |
|
|
|
deviceDataOpt.ifPresent(device::setDeviceData); |
|
|
|
Device savedDevice = deviceService.saveDevice(device); |
|
|
|
tbClusterService.onDeviceUpdated(savedDevice, device, false); |
|
|
|
return saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE, EdgeEventActionType.CREDENTIALS_REQUEST, deviceId, null); |
|
|
|
@ -462,7 +460,6 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor { |
|
|
|
} |
|
|
|
|
|
|
|
private DownlinkMsg convertRpcCallEventToDownlink(EdgeEvent edgeEvent) { |
|
|
|
log.trace("Executing convertRpcCallEventToDownlink, edgeEvent [{}]", edgeEvent); |
|
|
|
return DownlinkMsg.newBuilder() |
|
|
|
.setDownlinkMsgId(EdgeUtils.nextPositiveInt()) |
|
|
|
.addDeviceRpcCallMsg(deviceMsgConstructor.constructDeviceRpcCallMsg(edgeEvent.getEntityId(), edgeEvent.getBody())) |
|
|
|
|