revert: 还原设备上下逻辑

@@ -512,7 +512,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         }
     }
 
-    private boolean addDeviceUsingState(TopicPartitionInfo tpi, final DeviceStateData state) {
+    private boolean addDeviceUsingState(TopicPartitionInfo tpi, DeviceStateData state) {
         Set<DeviceId> deviceIds = partitionedEntities.get(tpi);
         if (deviceIds != null) {
             deviceIds.add(state.getDeviceId());
@@ -544,7 +544,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                         if (e instanceof TenantNotFoundException) {
                             idsFromRemovedTenant.add(deviceId);
                         } else {
-                            log.error("[{}] Failed to update inactivity state [{}]", deviceId, e.getMessage());
+                            log.warn("[{}] Failed to update inactivity state [{}]", deviceId, e.getMessage());
                         }
                     }
                 }
@@ -589,20 +589,17 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
             if (!isActive(ts, state)
                     && (state.getLastInactivityAlarmTime() == 0L || state.getLastInactivityAlarmTime() <= state.getLastActivityTime())
                     && stateData.getDeviceCreationTime() + state.getInactivityTimeout() <= ts) {
-
-                //thingskit code使设备下线，不必判断partition是不是isMyPartition，因为我也不知道if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition())是干嘛的
-                reportInactivity(ts, deviceId, stateData);
-                if(stateData.getState().getLastActivityTime()>0){
-                    String tenantId = stateData.getTenantId().getId().toString();
-                    String tbDeviceId = deviceId.getId().toString();
-                    saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
-                    channelService.updateVideoChannelState(deviceId.getId().toString(), StatusEnum.OFFLINE);
-                }
-
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
-
+                    reportInactivity(ts, deviceId, stateData);
+                    //thingskit
+                    if(stateData.getState().getLastActivityTime()>0){
+                        String tenantId = stateData.getTenantId().getId().toString();
+                        String tbDeviceId = deviceId.getId().toString();
+                        saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
+                        channelService.updateVideoChannelState(deviceId.getId().toString(), StatusEnum.OFFLINE);
+                    }
                 } else {
-                    log.error("updateInactivityStateIfExpired isMyPartition=false , serverType={},tenantId={},deviceId={}",ServiceType.TB_CORE,stateData.getTenantId(),deviceId);
+                    log.warn("updateInactivityStateIfExpired isMyPartition=false , serverType={},tenantId={},deviceId={}",ServiceType.TB_CORE,stateData.getTenantId(),deviceId);
                     cleanupEntity(deviceId);
                 }
             }