fixed sending inactivity event after device creation.

@@ -15,6 +15,7 @@
  */
  */
 package org.thingsboard.server.service.state;
 package org.thingsboard.server.service.state;
 
 
+import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Function;
 import com.google.common.base.Function;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.FutureCallback;
@@ -392,7 +393,7 @@ public class DefaultDeviceStateService implements DeviceStateService {
             if (stateData != null) {
             if (stateData != null) {
                 DeviceState state = stateData.getState();
                 DeviceState state = stateData.getState();
                 state.setActive(ts < state.getLastActivityTime() + state.getInactivityTimeout());
                 state.setActive(ts < state.getLastActivityTime() + state.getInactivityTimeout());
-                if (!state.isActive() && (state.getLastInactivityAlarmTime() == 0L || state.getLastInactivityAlarmTime() < state.getLastActivityTime())) {
+                if (!state.isActive() && (state.getLastInactivityAlarmTime() == 0L || state.getLastInactivityAlarmTime() < state.getLastActivityTime()) && UUIDs.unixTimestamp(deviceId.getId()) + state.getInactivityTimeout() < ts) {
                     state.setLastInactivityAlarmTime(ts);
                     state.setLastInactivityAlarmTime(ts);
                     pushRuleEngineMessage(stateData, INACTIVITY_EVENT);
                     pushRuleEngineMessage(stateData, INACTIVITY_EVENT);
                     save(deviceId, INACTIVITY_ALARM_TIME, ts);
                     save(deviceId, INACTIVITY_ALARM_TIME, ts);