fix:调整日志记录位置,与设备上下线保持一致（原因：http udp不会触发disconnect）

xp.Huang
1 parent d2f7e211
Showing 1 changed file with 10 additions and 8 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 @85fdd05
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @85fdd05
@@ -176,9 +176,6 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         save(deviceId, LAST_CONNECT_TIME, ts);
         pushRuleEngineMessage(stateData, CONNECT_EVENT);
         checkAndUpdateState(deviceId, stateData);
-        //ThingsKit
-        saveDeviceStateLog(tenantId.toString(),deviceId.toString(), FastIotConstants.StateValue.ONLINE);
-
     }
     @Override
@@ -204,8 +201,12 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                 save(deviceId, ACTIVITY_STATE, true);
                 pushRuleEngineMessage(stateData, ACTIVITY_EVENT);
                 //thingkit function
-                tkDeviceService.updateDeviceStateByTbDeviceId(stateData.getTenantId().getId().toString(),deviceId.getId().toString(),
+                String tenantId = stateData.getTenantId().getId().toString();
+                String tbDeviceId = deviceId.getId().toString();
+                tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
                         org.thingsboard.server.common.data.yunteng.enums.DeviceState.ONLINE);
+                //ThingsKit
+                saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.ONLINE);
             }
         } else {
             log.debug("updateActivityState - fetched state IN NULL for device {}, lastReportedActivity {}", deviceId, lastReportedActivity);
@@ -223,8 +224,6 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         stateData.getState().setLastDisconnectTime(ts);
         save(deviceId, LAST_DISCONNECT_TIME, ts);
         pushRuleEngineMessage(stateData, DISCONNECT_EVENT);
-        //ThingsKit
-        saveDeviceStateLog(tenantId.toString(),deviceId.toString(), FastIotConstants.StateValue.OFFLINE);
     }
     @Override
@@ -422,8 +421,11 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                     pushRuleEngineMessage(stateData, INACTIVITY_EVENT);
                     //thingskit update tkDevice state
                     if(stateData.getState().getLastActivityTime()>0){
-                        tkDeviceService.updateDeviceStateByTbDeviceId(stateData.getTenantId().getId().toString(),
-                                deviceId.getId().toString(),org.thingsboard.server.common.data.yunteng.enums.DeviceState.OFFLINE);
+                        String tenantId = stateData.getTenantId().getId().toString();
+                        String tbDeviceId = deviceId.getId().toString();
+                        tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
+                                org.thingsboard.server.common.data.yunteng.enums.DeviceState.OFFLINE);
+                        saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
                     }
                 } else {
                     cleanupEntity(deviceId);