dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes due to comments

Browse Source
This commit is contained in:
imbeacon 2024-04-08 11:45:26 +03:00
parent f621d59be3
commit bead94d832
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
View File

@ -16,6 +16,7 @@
package org.thingsboard.server.transport.mqtt.session; package org.thingsboard.server.transport.mqtt.session;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
@ -241,11 +242,12 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
public void onDeviceUpdate(TransportProtos.SessionInfoProto sessionInfo, Device device, Optional<DeviceProfile> deviceProfileOpt) { public void onDeviceUpdate(TransportProtos.SessionInfoProto sessionInfo, Device device, Optional<DeviceProfile> deviceProfileOpt) {
log.trace("[{}][{}] onDeviceUpdate: [{}]", gateway.getTenantId(), gateway.getDeviceId(), device); log.trace("[{}][{}] onDeviceUpdate: [{}]", gateway.getTenantId(), gateway.getDeviceId(), device);
if (device.getAdditionalInfo().has(GATEWAY_PROPERTY) JsonNode deviceAdditionalInfo = device.getAdditionalInfo();
&& device.getAdditionalInfo().get(GATEWAY_PROPERTY).asBoolean() if (deviceAdditionalInfo.has(GATEWAY_PROPERTY)
&& device.getAdditionalInfo().has(OVERWRITE_ACTIVITY_TIME) && deviceAdditionalInfo.get(GATEWAY_PROPERTY).asBoolean()
&& device.getAdditionalInfo().get(OVERWRITE_ACTIVITY_TIME).isBoolean()) { && deviceAdditionalInfo.has(OVERWRITE_ACTIVITY_TIME)
overwriteDevicesActivity = device.getAdditionalInfo().get(OVERWRITE_ACTIVITY_TIME).asBoolean(); && deviceAdditionalInfo.get(OVERWRITE_ACTIVITY_TIME).isBoolean()) {
overwriteDevicesActivity = deviceAdditionalInfo.get(OVERWRITE_ACTIVITY_TIME).asBoolean();
} }
} }