From 197db609ca8656847ad1677310a9f885de66fa1a Mon Sep 17 00:00:00 2001 From: Dmytro Shvaika Date: Tue, 11 Aug 2020 19:22:31 +0300 Subject: [PATCH] removed active field on Connect event reporting --- .../service/state/DefaultDeviceStateService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java index 0025f80d71..1563d5abf4 100644 --- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java +++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java @@ -16,6 +16,7 @@ package org.thingsboard.server.service.state; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.base.Function; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -503,8 +504,15 @@ public class DefaultDeviceStateService implements DeviceStateService { private void pushRuleEngineMessage(DeviceStateData stateData, String msgType) { DeviceState state = stateData.getState(); try { - TbMsg tbMsg = TbMsg.newMsg(msgType, stateData.getDeviceId(), stateData.getMetaData().copy(), TbMsgDataType.JSON - , json.writeValueAsString(state)); + String data; + if (msgType.equals(CONNECT_EVENT)) { + ObjectNode stateNode = json.convertValue(state, ObjectNode.class); + stateNode.remove(ACTIVITY_STATE); + data = stateNode.toString(); + } else { + data = json.writeValueAsString(state); + } + TbMsg tbMsg = TbMsg.newMsg(msgType, stateData.getDeviceId(), stateData.getMetaData().copy(), TbMsgDataType.JSON, data); clusterService.pushMsgToRuleEngine(stateData.getTenantId(), stateData.getDeviceId(), tbMsg, null); } catch (Exception e) { log.warn("[{}] Failed to push inactivity alarm: {}", stateData.getDeviceId(), state, e);