|
|
|
@ -21,7 +21,6 @@ import org.springframework.util.StringUtils; |
|
|
|
import org.thingsboard.rule.engine.api.TbContext; |
|
|
|
import org.thingsboard.rule.engine.profile.state.PersistedAlarmState; |
|
|
|
import org.thingsboard.rule.engine.profile.state.PersistedDeviceState; |
|
|
|
import org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode; |
|
|
|
import org.thingsboard.server.common.data.DataConstants; |
|
|
|
import org.thingsboard.server.common.data.Device; |
|
|
|
import org.thingsboard.server.common.data.DeviceProfile; |
|
|
|
@ -252,7 +251,7 @@ class DeviceState { |
|
|
|
|
|
|
|
protected boolean processTelemetry(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException { |
|
|
|
boolean stateChanged = false; |
|
|
|
Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToSortedTelemetry(new JsonParser().parse(msg.getData()), TbMsgTimeseriesNode.getTs(msg)); |
|
|
|
Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToSortedTelemetry(new JsonParser().parse(msg.getData()), msg.getMetaDataTs()); |
|
|
|
// iterate over data by ts (ASC order).
|
|
|
|
for (Map.Entry<Long, List<KvEntry>> entry : tsKvMap.entrySet()) { |
|
|
|
Long ts = entry.getKey(); |
|
|
|
|