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

Fix device state fuction

Browse Source
This commit is contained in:
Andrew Shvayka 2019-11-26 13:54:55 +02:00
parent e18582f912
commit 7471ada0c5
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View File

@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.thingsboard.server.actors.service.ActorService;
import org.thingsboard.server.common.data.DataConstants;
import org.thingsboard.server.common.data.Device;
@ -456,14 +457,15 @@ public class DefaultDeviceStateService implements DeviceStateService {
@Nullable
@Override
public DeviceStateData apply(@Nullable List<T> data) {
long lastActivityTime = getAttributeValue(data, LAST_ACTIVITY_TIME, 0L);
long inactivityAlarmTime = getAttributeValue(data, INACTIVITY_ALARM_TIME, 0L);
long inactivityTimeout = getAttributeValue(data, INACTIVITY_TIMEOUT, TimeUnit.SECONDS.toMillis(defaultInactivityTimeoutInSec));
try {
long lastActivityTime = getEntryValue(data, LAST_ACTIVITY_TIME, 0L);
long inactivityAlarmTime = getEntryValue(data, INACTIVITY_ALARM_TIME, 0L);
long inactivityTimeout = getEntryValue(data, INACTIVITY_TIMEOUT, TimeUnit.SECONDS.toMillis(defaultInactivityTimeoutInSec));
boolean active = System.currentTimeMillis() < lastActivityTime + inactivityTimeout;
DeviceState deviceState = DeviceState.builder()
.active(active)
.lastConnectTime(getAttributeValue(data, LAST_CONNECT_TIME, 0L))
.lastDisconnectTime(getAttributeValue(data, LAST_DISCONNECT_TIME, 0L))
.lastConnectTime(getEntryValue(data, LAST_CONNECT_TIME, 0L))
.lastDisconnectTime(getEntryValue(data, LAST_DISCONNECT_TIME, 0L))
.lastActivityTime(lastActivityTime)
.lastInactivityAlarmTime(inactivityAlarmTime)
.inactivityTimeout(inactivityTimeout)
@ -476,14 +478,19 @@ public class DefaultDeviceStateService implements DeviceStateService {
.deviceId(device.getId())
.metaData(md)
.state(deviceState).build();
} catch (Exception e) {
log.warn("[{}] Failed to fetch device state data", device.getId(), e);
}
}
};
}
private long getAttributeValue(List<? extends KvEntry> attributes, String attributeName, long defaultValue) {
for (KvEntry attribute : attributes) {
if (attribute.getKey().equals(attributeName)) {
return attribute.getLongValue().orElse(defaultValue);
private long getEntryValue(List<? extends KvEntry> kvEntries, String attributeName, long defaultValue) {
if (kvEntries != null) {
for (KvEntry entry : kvEntries) {
if (entry != null && !StringUtils.isEmpty(entry.getKey()) && entry.getKey().equals(attributeName)) {
return entry.getLongValue().orElse(defaultValue);
}
}
}
return defaultValue;