fix:解决边端向云端推送事件，云端设备不上线问题

lijianfa_14810364212
1 parent d024ac85
Showing 1 changed file with 11 additions and 7 deletions
application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @e10462f
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @e10462f
@@ -271,6 +271,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         }
         log.trace("[{}] on Device Activity [{}], lastReportedActivity [{}]", tenantId.getId(), deviceId.getId(), lastReportedActivity);
         final DeviceStateData stateData = getOrFetchDeviceStateData(deviceId);
+        System.out.println("State : "+stateData.getState().isActive());
         if (lastReportedActivity > 0 && lastReportedActivity > stateData.getState().getLastActivityTime()) {
             updateActivityState(deviceId, stateData, lastReportedActivity);
         }
@@ -292,8 +293,9 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
 				//thingkit function
                 String tenantId = stateData.getTenantId().getId().toString();
                 String tbDeviceId = deviceId.getId().toString();
-                tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
-                        org.thingsboard.server.common.data.yunteng.enums.DeviceState.ONLINE);
+//                tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
+//                        org.thingsboard.server.common.data.yunteng.enums.DeviceState.ONLINE);
+
                 //ThingsKit
                 saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.ONLINE);
             }
@@ -602,6 +604,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                         saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
                         //thingskit update tkDevice state
                         channelService.updateVideoChannelState(deviceId.getId().toString(), StatusEnum.OFFLINE);
+                        state.setActive(false);
                     }
                 } else {
                     cleanupEntity(deviceId);
@@ -689,13 +692,14 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
     private ListenableFuture<DeviceStateData> fetchDeviceState(Device device) {
         ListenableFuture<DeviceStateData> future;
-        if (persistToTelemetry) {
-            ListenableFuture<List<TsKvEntry>> tsData = tsService.findLatest(TenantId.SYS_TENANT_ID, device.getId(), PERSISTENT_ATTRIBUTES);
-            future = Futures.transform(tsData, extractDeviceStateData(device), MoreExecutors.directExecutor());
-        } else {
+        //thingskit code因为我们的设备在线逻辑总是从attribute取数据，所以这里也总是从attribute取数据
+//        if (persistToTelemetry) {
+//            ListenableFuture<List<TsKvEntry>> tsData = tsService.findLatest(TenantId.SYS_TENANT_ID, device.getId(), PERSISTENT_ATTRIBUTES);
+//            future = Futures.transform(tsData, extractDeviceStateData(device), MoreExecutors.directExecutor());
+//        } else {
             ListenableFuture<List<AttributeKvEntry>> attrData = attributesService.find(TenantId.SYS_TENANT_ID, device.getId(), SERVER_SCOPE, PERSISTENT_ATTRIBUTES);
             future = Futures.transform(attrData, extractDeviceStateData(device), MoreExecutors.directExecutor());
-        }
+//        }
         return transformInactivityTimeout(future);
     }