Merge branch '20230710' into 'master_dev'

refactor: 命令下发逻辑调整

See merge request yunteng/thingskit!209

@@ -72,6 +72,7 @@ import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
 import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
@@ -645,4 +646,10 @@ public class ActorSystemContext {
         }
         }
     }
     }
 
 
+
+    //Thingskit function
+    @Autowired
+    @Getter
+    private TkDeviceService tkDeviceService;
+
 }
 }

 /**
 /**
  * Copyright © 2016-2022 The Thingsboard Authors
  * Copyright © 2016-2022 The Thingsboard Authors
  *
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
  *
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
 package org.thingsboard.server.actors.device;
 package org.thingsboard.server.actors.device;
@@ -22,6 +20,21 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.JacksonUtil;
@@ -35,7 +48,6 @@ import org.thingsboard.server.actors.TbActorCtx;
 import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
 import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -59,8 +71,6 @@ import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
-import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
-import org.thingsboard.server.common.data.yunteng.enums.CmdTypeEnum;
 import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.queue.TbCallback;
@@ -97,921 +107,1109 @@ import org.thingsboard.server.service.rpc.RemoveRpcActorMsg;
 import org.thingsboard.server.service.rpc.ToDeviceRpcRequestActorMsg;
 import org.thingsboard.server.service.rpc.ToDeviceRpcRequestActorMsg;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
 
 
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-
 /**
 /**
  * @author Andrew Shvayka
  * @author Andrew Shvayka
  */
  */
 @Slf4j
 @Slf4j
 class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
 class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
 
 
-    static final String SESSION_TIMEOUT_MESSAGE = "session timeout!";
-    final TenantId tenantId;
-    final DeviceId deviceId;
-    final LinkedHashMapRemoveEldest<UUID, SessionInfoMetaData> sessions;
-    private final Map<UUID, SessionInfo> attributeSubscriptions;
-    private final Map<UUID, SessionInfo> rpcSubscriptions;
-    private final Map<Integer, ToDeviceRpcRequestMetadata> toDeviceRpcPendingMap;
-    private final boolean rpcSequential;
-
-    private int rpcSeq = 0;
-    private String deviceName;
-    private String deviceType;
-    private TbMsgMetaData defaultMetaData;
-    private EdgeId edgeId;
-
-    DeviceActorMessageProcessor(ActorSystemContext systemContext, TenantId tenantId, DeviceId deviceId) {
-        super(systemContext);
-        this.tenantId = tenantId;
-        this.deviceId = deviceId;
-        this.rpcSequential = systemContext.isRpcSequential();
-        this.attributeSubscriptions = new HashMap<>();
-        this.rpcSubscriptions = new HashMap<>();
-        this.toDeviceRpcPendingMap = new LinkedHashMap<>();
-        this.sessions = new LinkedHashMapRemoveEldest<>(systemContext.getMaxConcurrentSessionsPerDevice(), this::notifyTransportAboutClosedSessionMaxSessionsLimit);
-        if (initAttributes()) {
-            restoreSessions();
-        }
+  static final String SESSION_TIMEOUT_MESSAGE = "session timeout!";
+  final TenantId tenantId;
+  final DeviceId deviceId;
+  final LinkedHashMapRemoveEldest<UUID, SessionInfoMetaData> sessions;
+  private final Map<UUID, SessionInfo> attributeSubscriptions;
+  private final Map<UUID, SessionInfo> rpcSubscriptions;
+  private final Map<Integer, ToDeviceRpcRequestMetadata> toDeviceRpcPendingMap;
+  private final boolean rpcSequential;
+
+  private int rpcSeq = 0;
+  private String deviceName;
+  private String deviceType;
+  private TbMsgMetaData defaultMetaData;
+  private EdgeId edgeId;
+
+  DeviceActorMessageProcessor(
+      ActorSystemContext systemContext, TenantId tenantId, DeviceId deviceId) {
+    super(systemContext);
+    this.tenantId = tenantId;
+    this.deviceId = deviceId;
+    this.rpcSequential = systemContext.isRpcSequential();
+    this.attributeSubscriptions = new HashMap<>();
+    this.rpcSubscriptions = new HashMap<>();
+    this.toDeviceRpcPendingMap = new LinkedHashMap<>();
+    this.sessions =
+        new LinkedHashMapRemoveEldest<>(
+            systemContext.getMaxConcurrentSessionsPerDevice(),
+            this::notifyTransportAboutClosedSessionMaxSessionsLimit);
+    if (initAttributes()) {
+      restoreSessions();
     }
     }
-
-    boolean initAttributes() {
-        Device device = systemContext.getDeviceService().findDeviceById(tenantId, deviceId);
-        if (device != null) {
-            this.deviceName = device.getName();
-            this.deviceType = device.getType();
-            this.defaultMetaData = new TbMsgMetaData();
-            this.defaultMetaData.putValue("deviceName", deviceName);
-            this.defaultMetaData.putValue("deviceType", deviceType);
-            if (systemContext.isEdgesEnabled()) {
-                this.edgeId = findRelatedEdgeId();
-            }
-            return true;
-        } else {
-            return false;
-        }
+  }
+
+  boolean initAttributes() {
+    Device device = systemContext.getDeviceService().findDeviceById(tenantId, deviceId);
+    if (device != null) {
+      this.deviceName = device.getName();
+      this.deviceType = device.getType();
+      this.defaultMetaData = new TbMsgMetaData();
+      this.defaultMetaData.putValue("deviceName", deviceName);
+      this.defaultMetaData.putValue("deviceType", deviceType);
+      if (systemContext.isEdgesEnabled()) {
+        this.edgeId = findRelatedEdgeId();
+      }
+      return true;
+    } else {
+      return false;
     }
     }
-
-    private EdgeId findRelatedEdgeId() {
-        List<EntityRelation> result =
-                systemContext.getRelationService().findByToAndType(tenantId, deviceId, EntityRelation.EDGE_TYPE, RelationTypeGroup.COMMON);
-        if (result != null && result.size() > 0) {
-            EntityRelation relationToEdge = result.get(0);
-            if (relationToEdge.getFrom() != null && relationToEdge.getFrom().getId() != null) {
-                log.trace("[{}][{}] found edge [{}] for device", tenantId, deviceId, relationToEdge.getFrom().getId());
-                return new EdgeId(relationToEdge.getFrom().getId());
-            } else {
-                log.trace("[{}][{}] edge relation is empty {}", tenantId, deviceId, relationToEdge);
-            }
-        } else {
-            log.trace("[{}][{}] device doesn't have any related edge", tenantId, deviceId);
-        }
-        return null;
+  }
+
+  private EdgeId findRelatedEdgeId() {
+    List<EntityRelation> result =
+        systemContext
+            .getRelationService()
+            .findByToAndType(
+                tenantId, deviceId, EntityRelation.EDGE_TYPE, RelationTypeGroup.COMMON);
+    if (result != null && result.size() > 0) {
+      EntityRelation relationToEdge = result.get(0);
+      if (relationToEdge.getFrom() != null && relationToEdge.getFrom().getId() != null) {
+        log.trace(
+            "[{}][{}] found edge [{}] for device",
+            tenantId,
+            deviceId,
+            relationToEdge.getFrom().getId());
+        return new EdgeId(relationToEdge.getFrom().getId());
+      } else {
+        log.trace("[{}][{}] edge relation is empty {}", tenantId, deviceId, relationToEdge);
+      }
+    } else {
+      log.trace("[{}][{}] device doesn't have any related edge", tenantId, deviceId);
+    }
+    return null;
+  }
+
+  void processRpcRequest(TbActorCtx context, ToDeviceRpcRequestActorMsg msg) {
+    ToDeviceRpcRequest request = msg.getMsg();
+    ToDeviceRpcRequestMsg rpcRequest = creteToDeviceRpcRequestMsg(request);
+
+    long timeout = request.getExpirationTime() - System.currentTimeMillis();
+    boolean persisted = request.isPersisted();
+
+    if (timeout <= 0) {
+      log.debug(
+          "[{}][{}] Ignoring message due to exp time reached, {}",
+          deviceId,
+          request.getId(),
+          request.getExpirationTime());
+      if (persisted) {
+        createRpc(request, RpcStatus.EXPIRED);
+      }
+      return;
+    } else if (persisted) {
+      createRpc(request, RpcStatus.QUEUED);
     }
     }
 
 
-    void processRpcRequest(TbActorCtx context, ToDeviceRpcRequestActorMsg msg) {
-        ToDeviceRpcRequest request = msg.getMsg();
-        ToDeviceRpcRequestMsg rpcRequest = creteToDeviceRpcRequestMsg(request);
-
-        long timeout = request.getExpirationTime() - System.currentTimeMillis();
-        boolean persisted = request.isPersisted();
-
-        if (timeout <= 0) {
-            log.debug("[{}][{}] Ignoring message due to exp time reached, {}", deviceId, request.getId(), request.getExpirationTime());
-            if (persisted) {
-                createRpc(request, RpcStatus.EXPIRED);
+    boolean sent = false;
+    if (systemContext.isEdgesEnabled() && edgeId != null) {
+      log.debug(
+          "[{}][{}] device is related to edge [{}]. Saving RPC request to edge queue",
+          tenantId,
+          deviceId,
+          edgeId.getId());
+      saveRpcRequestToEdgeQueue(request, rpcRequest.getRequestId());
+      sent = true;
+    } else if (isSendNewRpcAvailable()) {
+      sent = rpcSubscriptions.size() > 0;
+      Set<UUID> syncSessionSet = new HashSet<>();
+      rpcSubscriptions.forEach(
+          (key, value) -> {
+            sendToTransport(rpcRequest, key, value.getNodeId());
+            if (SessionType.SYNC == value.getType()) {
+              syncSessionSet.add(key);
             }
             }
-            return;
-        } else if (persisted) {
-            createRpc(request, RpcStatus.QUEUED);
-        }
-
-        boolean sent = false;
-        if (systemContext.isEdgesEnabled() && edgeId != null) {
-            log.debug("[{}][{}] device is related to edge [{}]. Saving RPC request to edge queue", tenantId, deviceId, edgeId.getId());
-            saveRpcRequestToEdgeQueue(request, rpcRequest.getRequestId());
-            sent = true;
-        } else if (isSendNewRpcAvailable()) {
-            sent = rpcSubscriptions.size() > 0;
-            Set<UUID> syncSessionSet = new HashSet<>();
-            rpcSubscriptions.forEach((key, value) -> {
-                sendToTransport(rpcRequest, key, value.getNodeId());
-                if (SessionType.SYNC == value.getType()) {
-                    syncSessionSet.add(key);
-                }
-            });
-            log.trace("Rpc syncSessionSet [{}] subscription after sent [{}]", syncSessionSet, rpcSubscriptions);
-            syncSessionSet.forEach(rpcSubscriptions::remove);
-        }
-
-        if (persisted) {
-            ObjectNode response = JacksonUtil.newObjectNode();
-            response.put("rpcId", request.getId().toString());
-            systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(msg.getMsg().getId(), JacksonUtil.toString(response), null));
-        }
-
-        if (!persisted && request.isOneway() && sent) {
-            log.debug("[{}] Rpc command response sent [{}]!", deviceId, request.getId());
-            systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(msg.getMsg().getId(), null, null));
-        } else {
-            registerPendingRpcRequest(context, msg, sent, rpcRequest, timeout);
-        }
-        if (sent) {
-            log.debug("[{}] RPC request {} is sent!", deviceId, request.getId());
-        } else {
-            log.debug("[{}] RPC request {} is NOT sent!", deviceId, request.getId());
-        }
+          });
+      log.trace(
+          "Rpc syncSessionSet [{}] subscription after sent [{}]", syncSessionSet, rpcSubscriptions);
+      syncSessionSet.forEach(rpcSubscriptions::remove);
     }
     }
 
 
-    private boolean isSendNewRpcAvailable() {
-        return !rpcSequential || toDeviceRpcPendingMap.values().stream().filter(md -> !md.isDelivered()).findAny().isEmpty();
+    if (persisted) {
+      ObjectNode response = JacksonUtil.newObjectNode();
+      response.put("rpcId", request.getId().toString());
+      systemContext
+          .getTbCoreDeviceRpcService()
+          .processRpcResponseFromDeviceActor(
+              new FromDeviceRpcResponse(
+                  msg.getMsg().getId(), JacksonUtil.toString(response), null));
     }
     }
 
 
-    private Rpc createRpc(ToDeviceRpcRequest request, RpcStatus status) {
-        //Thingskit function
-        JsonNode old = JacksonUtil.toJsonNode(request.getAdditionalInfo());
-        ObjectNode additional = (old == null || old.isEmpty()) ?mapper.createObjectNode():(ObjectNode)old;
-        if(!additional.has(ModelConstants.TablePropertyMapping.COMMAND_TYPE)){
-            additional.put(ModelConstants.TablePropertyMapping.COMMAND_TYPE, CmdTypeEnum.DIY.ordinal());
-        }
-        DeviceId saveDeviceId = deviceId;
-        if(additional.has(FastIotConstants.Rpc.TARGET_ID)){
-            saveDeviceId = new DeviceId(UUID.fromString(additional.get(FastIotConstants.Rpc.TARGET_ID).asText()));
-        }
-
-        Rpc rpc = new Rpc(new RpcId(request.getId()));
-        rpc.setCreatedTime(System.currentTimeMillis());
-        rpc.setTenantId(tenantId);
-        rpc.setDeviceId(saveDeviceId);
-        rpc.setExpirationTime(request.getExpirationTime());
-        rpc.setRequest(JacksonUtil.valueToTree(request));
-        rpc.setStatus(status);
-		rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo()));
-
-        rpc.setAdditionalInfo(additional);
-
-        return systemContext.getTbRpcService().save(tenantId, rpc);
-    }
-
-    private ToDeviceRpcRequestMsg creteToDeviceRpcRequestMsg(ToDeviceRpcRequest request) {
-        ToDeviceRpcRequestBody body = request.getBody();
-        return ToDeviceRpcRequestMsg.newBuilder()
-                .setRequestId(rpcSeq++)
-                .setMethodName(body.getMethod())
-                .setParams(body.getParams())
-                .setExpirationTime(request.getExpirationTime())
-                .setRequestIdMSB(request.getId().getMostSignificantBits())
-                .setRequestIdLSB(request.getId().getLeastSignificantBits())
-                .setOneway(request.isOneway())
-                .setPersisted(request.isPersisted())
-                .build();
-    }
-
-    void processRpcResponsesFromEdge(TbActorCtx context, FromDeviceRpcResponseActorMsg responseMsg) {
-        log.debug("[{}] Processing rpc command response from edge session", deviceId);
-        ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
-        boolean success = requestMd != null;
-        if (success) {
-            systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(responseMsg.getMsg());
-        } else {
-            log.debug("[{}] Rpc command response [{}] is stale!", deviceId, responseMsg.getRequestId());
-        }
+    if (!persisted && request.isOneway() && sent) {
+      log.debug("[{}] Rpc command response sent [{}]!", deviceId, request.getId());
+      systemContext
+          .getTbCoreDeviceRpcService()
+          .processRpcResponseFromDeviceActor(
+              new FromDeviceRpcResponse(msg.getMsg().getId(), null, null));
+    } else {
+      registerPendingRpcRequest(context, msg, sent, rpcRequest, timeout);
     }
     }
-
-    void processRemoveRpc(TbActorCtx context, RemoveRpcActorMsg msg) {
-        log.debug("[{}] Processing remove rpc command", msg.getRequestId());
-        Map.Entry<Integer, ToDeviceRpcRequestMetadata> entry = null;
-        for (Map.Entry<Integer, ToDeviceRpcRequestMetadata> e : toDeviceRpcPendingMap.entrySet()) {
-            if (e.getValue().getMsg().getMsg().getId().equals(msg.getRequestId())) {
-                entry = e;
-                break;
-            }
-        }
-
-        if (entry != null) {
-            if (entry.getValue().isDelivered()) {
-                toDeviceRpcPendingMap.remove(entry.getKey());
-            } else {
-                Optional<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> firstRpc = getFirstRpc();
-                if (firstRpc.isPresent() && entry.getKey().equals(firstRpc.get().getKey())) {
-                    toDeviceRpcPendingMap.remove(entry.getKey());
-                    sendNextPendingRequest(context);
-                } else {
-                    toDeviceRpcPendingMap.remove(entry.getKey());
-                }
-            }
-        }
+    if (sent) {
+      log.debug("[{}] RPC request {} is sent!", deviceId, request.getId());
+    } else {
+      log.debug("[{}] RPC request {} is NOT sent!", deviceId, request.getId());
     }
     }
-
-    private void registerPendingRpcRequest(TbActorCtx context, ToDeviceRpcRequestActorMsg msg, boolean sent, ToDeviceRpcRequestMsg rpcRequest, long timeout) {
-        toDeviceRpcPendingMap.put(rpcRequest.getRequestId(), new ToDeviceRpcRequestMetadata(msg, sent));
-        DeviceActorServerSideRpcTimeoutMsg timeoutMsg = new DeviceActorServerSideRpcTimeoutMsg(rpcRequest.getRequestId(), timeout);
-        scheduleMsgWithDelay(context, timeoutMsg, timeoutMsg.getTimeout());
+  }
+
+  private boolean isSendNewRpcAvailable() {
+    return !rpcSequential
+        || toDeviceRpcPendingMap.values().stream()
+            .filter(md -> !md.isDelivered())
+            .findAny()
+            .isEmpty();
+  }
+
+  private Rpc createRpc(ToDeviceRpcRequest request, RpcStatus status) {
+    // Thingskit function
+    ObjectNode additional = (ObjectNode) JacksonUtil.toJsonNode(request.getAdditionalInfo());
+    DeviceId saveDeviceId = deviceId;
+    if (additional.has(FastIotConstants.Rpc.TARGET_ID)) {
+      saveDeviceId =
+          new DeviceId(UUID.fromString(additional.get(FastIotConstants.Rpc.TARGET_ID).asText()));
     }
     }
 
 
-    void processServerSideRpcTimeout(TbActorCtx context, DeviceActorServerSideRpcTimeoutMsg msg) {
-        ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(msg.getId());
-        if (requestMd != null) {
-            log.debug("[{}] RPC request [{}] timeout detected!", deviceId, msg.getId());
-            if (requestMd.getMsg().getMsg().isPersisted()) {
-                systemContext.getTbRpcService().save(tenantId, new RpcId(requestMd.getMsg().getMsg().getId()), RpcStatus.EXPIRED, null);
-            }
-            systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(),
-                    null, requestMd.isSent() ? RpcError.TIMEOUT : RpcError.NO_ACTIVE_CONNECTION));
-            if (!requestMd.isDelivered()) {
-                sendNextPendingRequest(context);
-            }
-        }
+    Rpc rpc = new Rpc(new RpcId(request.getId()));
+    rpc.setCreatedTime(System.currentTimeMillis());
+    rpc.setTenantId(tenantId);
+    rpc.setDeviceId(saveDeviceId);
+    rpc.setExpirationTime(request.getExpirationTime());
+    rpc.setRequest(JacksonUtil.valueToTree(request));
+    rpc.setStatus(status);
+    rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo()));
+
+    rpc.setAdditionalInfo(additional);
+
+    return systemContext.getTbRpcService().save(tenantId, rpc);
+  }
+
+  private ToDeviceRpcRequestMsg creteToDeviceRpcRequestMsg(ToDeviceRpcRequest request) {
+    ToDeviceRpcRequestBody body = request.getBody();
+    return ToDeviceRpcRequestMsg.newBuilder()
+        .setRequestId(rpcSeq++)
+        .setMethodName(body.getMethod())
+        .setParams(body.getParams())
+        .setExpirationTime(request.getExpirationTime())
+        .setRequestIdMSB(request.getId().getMostSignificantBits())
+        .setRequestIdLSB(request.getId().getLeastSignificantBits())
+        .setOneway(request.isOneway())
+        .setPersisted(request.isPersisted())
+        .build();
+  }
+
+  void processRpcResponsesFromEdge(TbActorCtx context, FromDeviceRpcResponseActorMsg responseMsg) {
+    log.debug("[{}] Processing rpc command response from edge session", deviceId);
+    ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
+    boolean success = requestMd != null;
+    if (success) {
+      systemContext
+          .getTbCoreDeviceRpcService()
+          .processRpcResponseFromDeviceActor(responseMsg.getMsg());
+    } else {
+      log.debug("[{}] Rpc command response [{}] is stale!", deviceId, responseMsg.getRequestId());
+    }
+  }
+
+  void processRemoveRpc(TbActorCtx context, RemoveRpcActorMsg msg) {
+    log.debug("[{}] Processing remove rpc command", msg.getRequestId());
+    Map.Entry<Integer, ToDeviceRpcRequestMetadata> entry = null;
+    for (Map.Entry<Integer, ToDeviceRpcRequestMetadata> e : toDeviceRpcPendingMap.entrySet()) {
+      if (e.getValue().getMsg().getMsg().getId().equals(msg.getRequestId())) {
+        entry = e;
+        break;
+      }
     }
     }
 
 
-    private void sendPendingRequests(TbActorCtx context, UUID sessionId, String nodeId) {
-        SessionType sessionType = getSessionType(sessionId);
-        if (!toDeviceRpcPendingMap.isEmpty()) {
-            log.debug("[{}] Pushing {} pending RPC messages to new async session [{}]", deviceId, toDeviceRpcPendingMap.size(), sessionId);
-            if (sessionType == SessionType.SYNC) {
-                log.debug("[{}] Cleanup sync rpc session [{}]", deviceId, sessionId);
-                rpcSubscriptions.remove(sessionId);
-            }
-        } else {
-            log.debug("[{}] No pending RPC messages for new async session [{}]", deviceId, sessionId);
-        }
-        Set<Integer> sentOneWayIds = new HashSet<>();
-
-        if (rpcSequential) {
-            getFirstRpc().ifPresent(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
-        } else if (sessionType == SessionType.ASYNC) {
-            toDeviceRpcPendingMap.entrySet().forEach(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
+    if (entry != null) {
+      if (entry.getValue().isDelivered()) {
+        toDeviceRpcPendingMap.remove(entry.getKey());
+      } else {
+        Optional<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> firstRpc = getFirstRpc();
+        if (firstRpc.isPresent() && entry.getKey().equals(firstRpc.get().getKey())) {
+          toDeviceRpcPendingMap.remove(entry.getKey());
+          sendNextPendingRequest(context);
         } else {
         } else {
-            toDeviceRpcPendingMap.entrySet().stream().findFirst().ifPresent(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
+          toDeviceRpcPendingMap.remove(entry.getKey());
         }
         }
-
-        sentOneWayIds.stream().filter(id -> !toDeviceRpcPendingMap.get(id).getMsg().getMsg().isPersisted()).forEach(toDeviceRpcPendingMap::remove);
+      }
     }
     }
-
-    private Optional<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> getFirstRpc() {
-        return toDeviceRpcPendingMap.entrySet().stream().filter(e -> !e.getValue().isDelivered()).findFirst();
+  }
+
+  private void registerPendingRpcRequest(
+      TbActorCtx context,
+      ToDeviceRpcRequestActorMsg msg,
+      boolean sent,
+      ToDeviceRpcRequestMsg rpcRequest,
+      long timeout) {
+    toDeviceRpcPendingMap.put(rpcRequest.getRequestId(), new ToDeviceRpcRequestMetadata(msg, sent));
+    DeviceActorServerSideRpcTimeoutMsg timeoutMsg =
+        new DeviceActorServerSideRpcTimeoutMsg(rpcRequest.getRequestId(), timeout);
+    scheduleMsgWithDelay(context, timeoutMsg, timeoutMsg.getTimeout());
+  }
+
+  void processServerSideRpcTimeout(TbActorCtx context, DeviceActorServerSideRpcTimeoutMsg msg) {
+    ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(msg.getId());
+    if (requestMd != null) {
+      log.debug("[{}] RPC request [{}] timeout detected!", deviceId, msg.getId());
+      if (requestMd.getMsg().getMsg().isPersisted()) {
+        systemContext
+            .getTbRpcService()
+            .save(
+                tenantId, new RpcId(requestMd.getMsg().getMsg().getId()), RpcStatus.EXPIRED, null);
+      }
+      systemContext
+          .getTbCoreDeviceRpcService()
+          .processRpcResponseFromDeviceActor(
+              new FromDeviceRpcResponse(
+                  requestMd.getMsg().getMsg().getId(),
+                  null,
+                  requestMd.isSent() ? RpcError.TIMEOUT : RpcError.NO_ACTIVE_CONNECTION));
+      if (!requestMd.isDelivered()) {
+        sendNextPendingRequest(context);
+      }
     }
     }
-
-    private void sendNextPendingRequest(TbActorCtx context) {
-        if (rpcSequential) {
-            rpcSubscriptions.forEach((id, s) -> sendPendingRequests(context, id, s.getNodeId()));
-        }
+  }
+
+  private void sendPendingRequests(TbActorCtx context, UUID sessionId, String nodeId) {
+    SessionType sessionType = getSessionType(sessionId);
+    if (!toDeviceRpcPendingMap.isEmpty()) {
+      log.debug(
+          "[{}] Pushing {} pending RPC messages to new async session [{}]",
+          deviceId,
+          toDeviceRpcPendingMap.size(),
+          sessionId);
+      if (sessionType == SessionType.SYNC) {
+        log.debug("[{}] Cleanup sync rpc session [{}]", deviceId, sessionId);
+        rpcSubscriptions.remove(sessionId);
+      }
+    } else {
+      log.debug("[{}] No pending RPC messages for new async session [{}]", deviceId, sessionId);
     }
     }
-
-    private Consumer<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> processPendingRpc(TbActorCtx context, UUID sessionId, String nodeId, Set<Integer> sentOneWayIds) {
-        return entry -> {
-            ToDeviceRpcRequest request = entry.getValue().getMsg().getMsg();
-            ToDeviceRpcRequestBody body = request.getBody();
-            if (request.isOneway() && !rpcSequential) {
-                sentOneWayIds.add(entry.getKey());
-                systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(request.getId(), null, null));
-            }
-            ToDeviceRpcRequestMsg rpcRequest = ToDeviceRpcRequestMsg.newBuilder()
-                    .setRequestId(entry.getKey())
-                    .setMethodName(body.getMethod())
-                    .setParams(body.getParams())
-                    .setExpirationTime(request.getExpirationTime())
-                    .setRequestIdMSB(request.getId().getMostSignificantBits())
-                    .setRequestIdLSB(request.getId().getLeastSignificantBits())
-                    .setOneway(request.isOneway())
-                    .setPersisted(request.isPersisted())
-                    .build();
-            sendToTransport(rpcRequest, sessionId, nodeId);
-        };
-    }
-
-    void process(TbActorCtx context, TransportToDeviceActorMsgWrapper wrapper) {
-        TransportToDeviceActorMsg msg = wrapper.getMsg();
-        TbCallback callback = wrapper.getCallback();
-        var sessionInfo = msg.getSessionInfo();
-
-        if (msg.hasSessionEvent()) {
-            processSessionStateMsgs(sessionInfo, msg.getSessionEvent());
-        }
-        if (msg.hasSubscribeToAttributes()) {
-            processSubscriptionCommands(context, sessionInfo, msg.getSubscribeToAttributes());
-        }
-        if (msg.hasSubscribeToRPC()) {
-            processSubscriptionCommands(context, sessionInfo, msg.getSubscribeToRPC());
-        }
-        if (msg.hasSendPendingRPC()) {
-            sendPendingRequests(context, getSessionId(sessionInfo), sessionInfo.getNodeId());
-        }
-        if (msg.hasGetAttributes()) {
-            handleGetAttributesRequest(context, sessionInfo, msg.getGetAttributes());
-        }
-        if (msg.hasToDeviceRPCCallResponse()) {
-            processRpcResponses(context, sessionInfo, msg.getToDeviceRPCCallResponse());
-        }
-        if (msg.hasSubscriptionInfo()) {
-            handleSessionActivity(context, sessionInfo, msg.getSubscriptionInfo());
-        }
-        if (msg.hasClaimDevice()) {
-            handleClaimDeviceMsg(context, sessionInfo, msg.getClaimDevice());
-        }
-        if (msg.hasRpcResponseStatusMsg()) {
-            processRpcResponseStatus(context, sessionInfo, msg.getRpcResponseStatusMsg());
-        }
-        if (msg.hasUplinkNotificationMsg()) {
-            processUplinkNotificationMsg(context, sessionInfo, msg.getUplinkNotificationMsg());
-        }
-        callback.onSuccess();
+    Set<Integer> sentOneWayIds = new HashSet<>();
+
+    if (rpcSequential) {
+      getFirstRpc().ifPresent(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
+    } else if (sessionType == SessionType.ASYNC) {
+      toDeviceRpcPendingMap
+          .entrySet()
+          .forEach(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
+    } else {
+      toDeviceRpcPendingMap.entrySet().stream()
+          .findFirst()
+          .ifPresent(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
     }
     }
 
 
-    private void processUplinkNotificationMsg(TbActorCtx context, SessionInfoProto sessionInfo, TransportProtos.UplinkNotificationMsg uplinkNotificationMsg) {
-        String nodeId = sessionInfo.getNodeId();
-        sessions.entrySet().stream()
-                .filter(kv -> kv.getValue().getSessionInfo().getNodeId().equals(nodeId) && (kv.getValue().isSubscribedToAttributes() || kv.getValue().isSubscribedToRPC()))
-                .forEach(kv -> {
-                    ToTransportMsg msg = ToTransportMsg.newBuilder()
-                            .setSessionIdMSB(kv.getKey().getMostSignificantBits())
-                            .setSessionIdLSB(kv.getKey().getLeastSignificantBits())
-                            .setUplinkNotificationMsg(uplinkNotificationMsg)
-                            .build();
-                    systemContext.getTbCoreToTransportService().process(kv.getValue().getSessionInfo().getNodeId(), msg);
-                });
-    }
+    sentOneWayIds.stream()
+        .filter(id -> !toDeviceRpcPendingMap.get(id).getMsg().getMsg().isPersisted())
+        .forEach(toDeviceRpcPendingMap::remove);
+  }
 
 
-    private void handleClaimDeviceMsg(TbActorCtx context, SessionInfoProto sessionInfo, ClaimDeviceMsg msg) {
-        DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
-        systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
-    }
+  private Optional<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> getFirstRpc() {
+    return toDeviceRpcPendingMap.entrySet().stream()
+        .filter(e -> !e.getValue().isDelivered())
+        .findFirst();
+  }
 
 
-    private void reportSessionOpen() {
-        systemContext.getDeviceStateService().onDeviceConnect(tenantId, deviceId);
+  private void sendNextPendingRequest(TbActorCtx context) {
+    if (rpcSequential) {
+      rpcSubscriptions.forEach((id, s) -> sendPendingRequests(context, id, s.getNodeId()));
     }
     }
-
-    private void reportSessionClose() {
-        systemContext.getDeviceStateService().onDeviceDisconnect(tenantId, deviceId);
+  }
+
+  private Consumer<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> processPendingRpc(
+      TbActorCtx context, UUID sessionId, String nodeId, Set<Integer> sentOneWayIds) {
+    return entry -> {
+      ToDeviceRpcRequest request = entry.getValue().getMsg().getMsg();
+      ToDeviceRpcRequestBody body = request.getBody();
+      if (request.isOneway() && !rpcSequential) {
+        sentOneWayIds.add(entry.getKey());
+        systemContext
+            .getTbCoreDeviceRpcService()
+            .processRpcResponseFromDeviceActor(
+                new FromDeviceRpcResponse(request.getId(), null, null));
+      }
+      ToDeviceRpcRequestMsg rpcRequest =
+          ToDeviceRpcRequestMsg.newBuilder()
+              .setRequestId(entry.getKey())
+              .setMethodName(body.getMethod())
+              .setParams(body.getParams())
+              .setExpirationTime(request.getExpirationTime())
+              .setRequestIdMSB(request.getId().getMostSignificantBits())
+              .setRequestIdLSB(request.getId().getLeastSignificantBits())
+              .setOneway(request.isOneway())
+              .setPersisted(request.isPersisted())
+              .build();
+      sendToTransport(rpcRequest, sessionId, nodeId);
+    };
+  }
+
+  void process(TbActorCtx context, TransportToDeviceActorMsgWrapper wrapper) {
+    TransportToDeviceActorMsg msg = wrapper.getMsg();
+    TbCallback callback = wrapper.getCallback();
+    var sessionInfo = msg.getSessionInfo();
+
+    if (msg.hasSessionEvent()) {
+      processSessionStateMsgs(sessionInfo, msg.getSessionEvent());
     }
     }
-
-    private void handleGetAttributesRequest(TbActorCtx context, SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
-        int requestId = request.getRequestId();
-        if (request.getOnlyShared()) {
-            Futures.addCallback(findAllAttributesByScope(DataConstants.SHARED_SCOPE), new FutureCallback<>() {
-                @Override
-                public void onSuccess(@Nullable List<AttributeKvEntry> result) {
-                    GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
-                            .setRequestId(requestId)
-                            .setSharedStateMsg(true)
-                            .addAllSharedAttributeList(toTsKvProtos(result))
-                            .setIsMultipleAttributesRequest(request.getSharedAttributeNamesCount() > 1)
-                            .build();
-                    sendToTransport(responseMsg, sessionInfo);
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
-                            .setError(t.getMessage())
-                            .setSharedStateMsg(true)
-                            .build();
-                    sendToTransport(responseMsg, sessionInfo);
-                }
-            }, MoreExecutors.directExecutor());
-        } else {
-            Futures.addCallback(getAttributesKvEntries(request), new FutureCallback<>() {
-                @Override
-                public void onSuccess(@Nullable List<List<AttributeKvEntry>> result) {
-                    GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
-                            .setRequestId(requestId)
-                            .addAllClientAttributeList(toTsKvProtos(result.get(0)))
-                            .addAllSharedAttributeList(toTsKvProtos(result.get(1)))
-                            .setIsMultipleAttributesRequest(
-                                    request.getSharedAttributeNamesCount() + request.getClientAttributeNamesCount() > 1)
-                            .build();
-                    sendToTransport(responseMsg, sessionInfo);
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
-                            .setError(t.getMessage())
-                            .build();
-                    sendToTransport(responseMsg, sessionInfo);
-                }
-            }, MoreExecutors.directExecutor());
-        }
+    if (msg.hasSubscribeToAttributes()) {
+      processSubscriptionCommands(context, sessionInfo, msg.getSubscribeToAttributes());
     }
     }
-
-    private ListenableFuture<List<List<AttributeKvEntry>>> getAttributesKvEntries(GetAttributeRequestMsg request) {
-        ListenableFuture<List<AttributeKvEntry>> clientAttributesFuture;
-        ListenableFuture<List<AttributeKvEntry>> sharedAttributesFuture;
-        if (CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
-            clientAttributesFuture = findAllAttributesByScope(DataConstants.CLIENT_SCOPE);
-            sharedAttributesFuture = findAllAttributesByScope(DataConstants.SHARED_SCOPE);
-        } else if (!CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && !CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
-            clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), DataConstants.CLIENT_SCOPE);
-            sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), DataConstants.SHARED_SCOPE);
-        } else if (CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && !CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
-            clientAttributesFuture = Futures.immediateFuture(Collections.emptyList());
-            sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), DataConstants.SHARED_SCOPE);
-        } else {
-            sharedAttributesFuture = Futures.immediateFuture(Collections.emptyList());
-            clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), DataConstants.CLIENT_SCOPE);
-        }
-        return Futures.allAsList(Arrays.asList(clientAttributesFuture, sharedAttributesFuture));
+    if (msg.hasSubscribeToRPC()) {
+      processSubscriptionCommands(context, sessionInfo, msg.getSubscribeToRPC());
     }
     }
-
-    private ListenableFuture<List<AttributeKvEntry>> findAllAttributesByScope(String scope) {
-        return systemContext.getAttributesService().findAll(tenantId, deviceId, scope);
+    if (msg.hasSendPendingRPC()) {
+      sendPendingRequests(context, getSessionId(sessionInfo), sessionInfo.getNodeId());
     }
     }
-
-    private ListenableFuture<List<AttributeKvEntry>> findAttributesByScope(Set<String> attributesSet, String scope) {
-        return systemContext.getAttributesService().find(tenantId, deviceId, scope, attributesSet);
+    if (msg.hasGetAttributes()) {
+      handleGetAttributesRequest(context, sessionInfo, msg.getGetAttributes());
     }
     }
-
-    private Set<String> toSet(List<String> strings) {
-        return new HashSet<>(strings);
+    if (msg.hasToDeviceRPCCallResponse()) {
+      processRpcResponses(context, sessionInfo, msg.getToDeviceRPCCallResponse());
     }
     }
-
-    private SessionType getSessionType(UUID sessionId) {
-        return sessions.containsKey(sessionId) ? SessionType.ASYNC : SessionType.SYNC;
+    if (msg.hasSubscriptionInfo()) {
+      handleSessionActivity(context, sessionInfo, msg.getSubscriptionInfo());
     }
     }
-
-    void processAttributesUpdate(TbActorCtx context, DeviceAttributesEventNotificationMsg msg) {
-        if (attributeSubscriptions.size() > 0) {
-            boolean hasNotificationData = false;
-            AttributeUpdateNotificationMsg.Builder notification = AttributeUpdateNotificationMsg.newBuilder();
-            if (msg.isDeleted()) {
-                List<String> sharedKeys = msg.getDeletedKeys().stream()
-                        .filter(key -> DataConstants.SHARED_SCOPE.equals(key.getScope()))
-                        .map(AttributeKey::getAttributeKey)
-                        .collect(Collectors.toList());
-                if (!sharedKeys.isEmpty()) {
-                    notification.addAllSharedDeleted(sharedKeys);
-                    hasNotificationData = true;
-                }
-            } else {
-                if (DataConstants.SHARED_SCOPE.equals(msg.getScope())) {
-                    List<AttributeKvEntry> attributes = new ArrayList<>(msg.getValues());
-                    if (attributes.size() > 0) {
-                        List<TsKvProto> sharedUpdated = msg.getValues().stream().map(this::toTsKvProto)
-                                .collect(Collectors.toList());
-                        if (!sharedUpdated.isEmpty()) {
-                            notification.addAllSharedUpdated(sharedUpdated);
-                            hasNotificationData = true;
-                        }
-                    } else {
-                        log.debug("[{}] No public shared side attributes changed!", deviceId);
-                    }
-                }
-            }
-            if (hasNotificationData) {
-                AttributeUpdateNotificationMsg finalNotification = notification.build();
-                attributeSubscriptions.forEach((key, value) -> sendToTransport(finalNotification, key, value.getNodeId()));
-            }
-        } else {
-            log.debug("[{}] No registered attributes subscriptions to process!", deviceId);
-        }
+    if (msg.hasClaimDevice()) {
+      handleClaimDeviceMsg(context, sessionInfo, msg.getClaimDevice());
     }
     }
-
-    private void processRpcResponses(TbActorCtx context, SessionInfoProto sessionInfo, ToDeviceRpcResponseMsg responseMsg) {
-        UUID sessionId = getSessionId(sessionInfo);
-        log.debug("[{}] Processing rpc command response [{}]", deviceId, sessionId);
-        ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
-        boolean success = requestMd != null;
-        if (success) {
-            boolean hasError = StringUtils.isNotEmpty(responseMsg.getError());
-            try {
-                String payload = hasError ? responseMsg.getError() : responseMsg.getPayload();
-                systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(
-                        new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(),
-                                payload, null));
-                if (requestMd.getMsg().getMsg().isPersisted()) {
-                    RpcStatus status = hasError ? RpcStatus.FAILED : RpcStatus.SUCCESSFUL;
-                    JsonNode response;
-                    try {
-                        response = JacksonUtil.toJsonNode(payload);
-                    } catch (IllegalArgumentException e) {
-                        response = JacksonUtil.newObjectNode().put("error", payload);
-                    }
-                    systemContext.getTbRpcService().save(tenantId, new RpcId(requestMd.getMsg().getMsg().getId()), status, response);
-                }
-            } finally {
-                if (hasError && !requestMd.isDelivered()) {
-                    sendNextPendingRequest(context);
-                }
-            }
-        } else {
-            log.debug("[{}] Rpc command response [{}] is stale!", deviceId, responseMsg.getRequestId());
-        }
+    if (msg.hasRpcResponseStatusMsg()) {
+      processRpcResponseStatus(context, sessionInfo, msg.getRpcResponseStatusMsg());
     }
     }
-
-    private void processRpcResponseStatus(TbActorCtx context, SessionInfoProto sessionInfo, ToDeviceRpcResponseStatusMsg responseMsg) {
-        UUID rpcId = new UUID(responseMsg.getRequestIdMSB(), responseMsg.getRequestIdLSB());
-        RpcStatus status = RpcStatus.valueOf(responseMsg.getStatus());
-        ToDeviceRpcRequestMetadata md = toDeviceRpcPendingMap.get(responseMsg.getRequestId());
-
-        if (md != null) {
-            JsonNode response = null;
-            if (status.equals(RpcStatus.DELIVERED)) {
-                if (md.getMsg().getMsg().isOneway()) {
-                    toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
-                    if (rpcSequential) {
-                        systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(rpcId, null, null));
-                    }
-                } else {
-                    md.setDelivered(true);
-                }
-            } else if (status.equals(RpcStatus.TIMEOUT)) {
-                Integer maxRpcRetries = md.getMsg().getMsg().getRetries();
-                maxRpcRetries = maxRpcRetries == null ? systemContext.getMaxRpcRetries() : Math.min(maxRpcRetries, systemContext.getMaxRpcRetries());
-                if (maxRpcRetries <= md.getRetries()) {
-                    toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
-                    status = RpcStatus.FAILED;
-                    response = JacksonUtil.newObjectNode().put("error", "There was a Timeout and all retry attempts have been exhausted. Retry attempts set: " + maxRpcRetries);
-                } else {
-                    md.setRetries(md.getRetries() + 1);
-                }
+    if (msg.hasUplinkNotificationMsg()) {
+      processUplinkNotificationMsg(context, sessionInfo, msg.getUplinkNotificationMsg());
+    }
+    callback.onSuccess();
+  }
+
+  private void processUplinkNotificationMsg(
+      TbActorCtx context,
+      SessionInfoProto sessionInfo,
+      TransportProtos.UplinkNotificationMsg uplinkNotificationMsg) {
+    String nodeId = sessionInfo.getNodeId();
+    sessions.entrySet().stream()
+        .filter(
+            kv ->
+                kv.getValue().getSessionInfo().getNodeId().equals(nodeId)
+                    && (kv.getValue().isSubscribedToAttributes()
+                        || kv.getValue().isSubscribedToRPC()))
+        .forEach(
+            kv -> {
+              ToTransportMsg msg =
+                  ToTransportMsg.newBuilder()
+                      .setSessionIdMSB(kv.getKey().getMostSignificantBits())
+                      .setSessionIdLSB(kv.getKey().getLeastSignificantBits())
+                      .setUplinkNotificationMsg(uplinkNotificationMsg)
+                      .build();
+              systemContext
+                  .getTbCoreToTransportService()
+                  .process(kv.getValue().getSessionInfo().getNodeId(), msg);
+            });
+  }
+
+  private void handleClaimDeviceMsg(
+      TbActorCtx context, SessionInfoProto sessionInfo, ClaimDeviceMsg msg) {
+    DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
+    systemContext
+        .getClaimDevicesService()
+        .registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
+  }
+
+  private void reportSessionOpen() {
+    systemContext.getDeviceStateService().onDeviceConnect(tenantId, deviceId);
+  }
+
+  private void reportSessionClose() {
+    systemContext.getDeviceStateService().onDeviceDisconnect(tenantId, deviceId);
+  }
+
+  private void handleGetAttributesRequest(
+      TbActorCtx context, SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
+    int requestId = request.getRequestId();
+    if (request.getOnlyShared()) {
+      Futures.addCallback(
+          findAllAttributesByScope(DataConstants.SHARED_SCOPE),
+          new FutureCallback<>() {
+            @Override
+            public void onSuccess(@Nullable List<AttributeKvEntry> result) {
+              GetAttributeResponseMsg responseMsg =
+                  GetAttributeResponseMsg.newBuilder()
+                      .setRequestId(requestId)
+                      .setSharedStateMsg(true)
+                      .addAllSharedAttributeList(toTsKvProtos(result))
+                      .setIsMultipleAttributesRequest(request.getSharedAttributeNamesCount() > 1)
+                      .build();
+              sendToTransport(responseMsg, sessionInfo);
             }
             }
 
 
-            if (md.getMsg().getMsg().isPersisted()) {
-                systemContext.getTbRpcService().save(tenantId, new RpcId(rpcId), status, response);
+            @Override
+            public void onFailure(Throwable t) {
+              GetAttributeResponseMsg responseMsg =
+                  GetAttributeResponseMsg.newBuilder()
+                      .setError(t.getMessage())
+                      .setSharedStateMsg(true)
+                      .build();
+              sendToTransport(responseMsg, sessionInfo);
             }
             }
-            if (status != RpcStatus.SENT) {
-                sendNextPendingRequest(context);
+          },
+          MoreExecutors.directExecutor());
+    } else {
+      Futures.addCallback(
+          getAttributesKvEntries(request),
+          new FutureCallback<>() {
+            @Override
+            public void onSuccess(@Nullable List<List<AttributeKvEntry>> result) {
+              GetAttributeResponseMsg responseMsg =
+                  GetAttributeResponseMsg.newBuilder()
+                      .setRequestId(requestId)
+                      .addAllClientAttributeList(toTsKvProtos(result.get(0)))
+                      .addAllSharedAttributeList(toTsKvProtos(result.get(1)))
+                      .setIsMultipleAttributesRequest(
+                          request.getSharedAttributeNamesCount()
+                                  + request.getClientAttributeNamesCount()
+                              > 1)
+                      .build();
+              sendToTransport(responseMsg, sessionInfo);
             }
             }
-        } else {
-            log.info("[{}][{}] Rpc has already removed from pending map.", deviceId, rpcId);
-        }
-    }
 
 
-    private void processSubscriptionCommands(TbActorCtx context, SessionInfoProto sessionInfo, SubscribeToAttributeUpdatesMsg subscribeCmd) {
-        UUID sessionId = getSessionId(sessionInfo);
-        if (subscribeCmd.getUnsubscribe()) {
-            log.debug("[{}] Canceling attributes subscription for session [{}]", deviceId, sessionId);
-            attributeSubscriptions.remove(sessionId);
-        } else {
-            SessionInfoMetaData sessionMD = sessions.get(sessionId);
-            if (sessionMD == null) {
-                sessionMD = new SessionInfoMetaData(new SessionInfo(subscribeCmd.getSessionType(), sessionInfo.getNodeId()));
+            @Override
+            public void onFailure(Throwable t) {
+              GetAttributeResponseMsg responseMsg =
+                  GetAttributeResponseMsg.newBuilder().setError(t.getMessage()).build();
+              sendToTransport(responseMsg, sessionInfo);
             }
             }
-            sessionMD.setSubscribedToAttributes(true);
-            log.debug("[{}] Registering attributes subscription for session [{}]", deviceId, sessionId);
-            attributeSubscriptions.put(sessionId, sessionMD.getSessionInfo());
-            dumpSessions();
-        }
+          },
+          MoreExecutors.directExecutor());
     }
     }
-
-    private UUID getSessionId(SessionInfoProto sessionInfo) {
-        return new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB());
+  }
+
+  private ListenableFuture<List<List<AttributeKvEntry>>> getAttributesKvEntries(
+      GetAttributeRequestMsg request) {
+    ListenableFuture<List<AttributeKvEntry>> clientAttributesFuture;
+    ListenableFuture<List<AttributeKvEntry>> sharedAttributesFuture;
+    if (CollectionUtils.isEmpty(request.getClientAttributeNamesList())
+        && CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
+      clientAttributesFuture = findAllAttributesByScope(DataConstants.CLIENT_SCOPE);
+      sharedAttributesFuture = findAllAttributesByScope(DataConstants.SHARED_SCOPE);
+    } else if (!CollectionUtils.isEmpty(request.getClientAttributeNamesList())
+        && !CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
+      clientAttributesFuture =
+          findAttributesByScope(
+              toSet(request.getClientAttributeNamesList()), DataConstants.CLIENT_SCOPE);
+      sharedAttributesFuture =
+          findAttributesByScope(
+              toSet(request.getSharedAttributeNamesList()), DataConstants.SHARED_SCOPE);
+    } else if (CollectionUtils.isEmpty(request.getClientAttributeNamesList())
+        && !CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
+      clientAttributesFuture = Futures.immediateFuture(Collections.emptyList());
+      sharedAttributesFuture =
+          findAttributesByScope(
+              toSet(request.getSharedAttributeNamesList()), DataConstants.SHARED_SCOPE);
+    } else {
+      sharedAttributesFuture = Futures.immediateFuture(Collections.emptyList());
+      clientAttributesFuture =
+          findAttributesByScope(
+              toSet(request.getClientAttributeNamesList()), DataConstants.CLIENT_SCOPE);
     }
     }
-
-    private void processSubscriptionCommands(TbActorCtx context, SessionInfoProto sessionInfo, SubscribeToRPCMsg subscribeCmd) {
-        UUID sessionId = getSessionId(sessionInfo);
-        if (subscribeCmd.getUnsubscribe()) {
-            log.debug("[{}] Canceling rpc subscription for session [{}]", deviceId, sessionId);
-            rpcSubscriptions.remove(sessionId);
-        } else {
-            SessionInfoMetaData sessionMD = sessions.get(sessionId);
-            if (sessionMD == null) {
-                sessionMD = new SessionInfoMetaData(new SessionInfo(subscribeCmd.getSessionType(), sessionInfo.getNodeId()));
-            }
-            sessionMD.setSubscribedToRPC(true);
-            log.debug("[{}] Registering rpc subscription for session [{}]", deviceId, sessionId);
-            rpcSubscriptions.put(sessionId, sessionMD.getSessionInfo());
-            sendPendingRequests(context, sessionId, sessionInfo.getNodeId());
-            dumpSessions();
+    return Futures.allAsList(Arrays.asList(clientAttributesFuture, sharedAttributesFuture));
+  }
+
+  private ListenableFuture<List<AttributeKvEntry>> findAllAttributesByScope(String scope) {
+    return systemContext.getAttributesService().findAll(tenantId, deviceId, scope);
+  }
+
+  private ListenableFuture<List<AttributeKvEntry>> findAttributesByScope(
+      Set<String> attributesSet, String scope) {
+    return systemContext.getAttributesService().find(tenantId, deviceId, scope, attributesSet);
+  }
+
+  private Set<String> toSet(List<String> strings) {
+    return new HashSet<>(strings);
+  }
+
+  private SessionType getSessionType(UUID sessionId) {
+    return sessions.containsKey(sessionId) ? SessionType.ASYNC : SessionType.SYNC;
+  }
+
+  void processAttributesUpdate(TbActorCtx context, DeviceAttributesEventNotificationMsg msg) {
+    if (attributeSubscriptions.size() > 0) {
+      boolean hasNotificationData = false;
+      AttributeUpdateNotificationMsg.Builder notification =
+          AttributeUpdateNotificationMsg.newBuilder();
+      if (msg.isDeleted()) {
+        List<String> sharedKeys =
+            msg.getDeletedKeys().stream()
+                .filter(key -> DataConstants.SHARED_SCOPE.equals(key.getScope()))
+                .map(AttributeKey::getAttributeKey)
+                .collect(Collectors.toList());
+        if (!sharedKeys.isEmpty()) {
+          notification.addAllSharedDeleted(sharedKeys);
+          hasNotificationData = true;
         }
         }
-    }
-
-    private void processSessionStateMsgs(SessionInfoProto sessionInfo, SessionEventMsg msg) {
-        UUID sessionId = getSessionId(sessionInfo);
-        Objects.requireNonNull(sessionId);
-        if (msg.getEvent() == SessionEvent.OPEN) {
-            if (sessions.containsKey(sessionId)) {
-                log.debug("[{}] Received duplicate session open event [{}]", deviceId, sessionId);
-                return;
-            }
-            log.debug("[{}] Processing new session [{}]. Current sessions size {}", deviceId, sessionId, sessions.size());
-
-            sessions.put(sessionId, new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfo.getNodeId())));
-            if (sessions.size() == 1) {
-                reportSessionOpen();
+      } else {
+        if (DataConstants.SHARED_SCOPE.equals(msg.getScope())) {
+          List<AttributeKvEntry> attributes = new ArrayList<>(msg.getValues());
+          if (attributes.size() > 0) {
+            List<TsKvProto> sharedUpdated =
+                msg.getValues().stream().map(this::toTsKvProto).collect(Collectors.toList());
+            if (!sharedUpdated.isEmpty()) {
+              notification.addAllSharedUpdated(sharedUpdated);
+              hasNotificationData = true;
             }
             }
-            systemContext.getDeviceStateService().onDeviceActivity(tenantId, deviceId, System.currentTimeMillis());
-            dumpSessions();
-        } else if (msg.getEvent() == SessionEvent.CLOSED) {
-            log.debug("[{}] Canceling subscriptions for closed session [{}]", deviceId, sessionId);
-            sessions.remove(sessionId);
-            attributeSubscriptions.remove(sessionId);
-            rpcSubscriptions.remove(sessionId);
-            if (sessions.isEmpty()) {
-                reportSessionClose();
-            }
-            dumpSessions();
+          } else {
+            log.debug("[{}] No public shared side attributes changed!", deviceId);
+          }
         }
         }
+      }
+      if (hasNotificationData) {
+        AttributeUpdateNotificationMsg finalNotification = notification.build();
+        attributeSubscriptions.forEach(
+            (key, value) -> sendToTransport(finalNotification, key, value.getNodeId()));
+      }
+    } else {
+      log.debug("[{}] No registered attributes subscriptions to process!", deviceId);
     }
     }
-
-    private void handleSessionActivity(TbActorCtx context, SessionInfoProto sessionInfoProto, SubscriptionInfoProto subscriptionInfo) {
-        UUID sessionId = getSessionId(sessionInfoProto);
-        Objects.requireNonNull(sessionId);
-
-        SessionInfoMetaData sessionMD = sessions.get(sessionId);
-        if (sessionMD != null) {
-            sessionMD.setLastActivityTime(subscriptionInfo.getLastActivityTime());
-            sessionMD.setSubscribedToAttributes(subscriptionInfo.getAttributeSubscription());
-            sessionMD.setSubscribedToRPC(subscriptionInfo.getRpcSubscription());
-            if (subscriptionInfo.getAttributeSubscription()) {
-                attributeSubscriptions.putIfAbsent(sessionId, sessionMD.getSessionInfo());
-            }
-            if (subscriptionInfo.getRpcSubscription()) {
-                rpcSubscriptions.putIfAbsent(sessionId, sessionMD.getSessionInfo());
-            }
+  }
+
+  private void processRpcResponses(
+      TbActorCtx context, SessionInfoProto sessionInfo, ToDeviceRpcResponseMsg responseMsg) {
+    UUID sessionId = getSessionId(sessionInfo);
+    log.debug("[{}] Processing rpc command response [{}]", deviceId, sessionId);
+    ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
+    boolean success = requestMd != null;
+    if (success) {
+      boolean hasError = StringUtils.isNotEmpty(responseMsg.getError());
+      try {
+        String payload = hasError ? responseMsg.getError() : responseMsg.getPayload();
+        systemContext
+            .getTbCoreDeviceRpcService()
+            .processRpcResponseFromDeviceActor(
+                new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(), payload, null));
+        if (requestMd.getMsg().getMsg().isPersisted()) {
+          RpcStatus status = hasError ? RpcStatus.FAILED : RpcStatus.SUCCESSFUL;
+          JsonNode response;
+          try {
+            response = JacksonUtil.toJsonNode(payload);
+          } catch (IllegalArgumentException e) {
+            response = JacksonUtil.newObjectNode().put("error", payload);
+          }
+          systemContext
+              .getTbRpcService()
+              .save(tenantId, new RpcId(requestMd.getMsg().getMsg().getId()), status, response);
         }
         }
-        systemContext.getDeviceStateService().onDeviceActivity(tenantId, deviceId, subscriptionInfo.getLastActivityTime());
-        if (sessionMD != null) {
-            dumpSessions();
+      } finally {
+        if (hasError && !requestMd.isDelivered()) {
+          sendNextPendingRequest(context);
         }
         }
+      }
+    } else {
+      log.debug("[{}] Rpc command response [{}] is stale!", deviceId, responseMsg.getRequestId());
     }
     }
-
-    void processCredentialsUpdate(TbActorMsg msg) {
-        if (((DeviceCredentialsUpdateNotificationMsg) msg).getDeviceCredentials().getCredentialsType() == DeviceCredentialsType.LWM2M_CREDENTIALS) {
-            sessions.forEach((k, v) -> {
-                notifyTransportAboutDeviceCredentialsUpdate(k, v, ((DeviceCredentialsUpdateNotificationMsg) msg).getDeviceCredentials());
-            });
+  }
+
+  private void processRpcResponseStatus(
+      TbActorCtx context, SessionInfoProto sessionInfo, ToDeviceRpcResponseStatusMsg responseMsg) {
+    UUID rpcId = new UUID(responseMsg.getRequestIdMSB(), responseMsg.getRequestIdLSB());
+    RpcStatus status = RpcStatus.valueOf(responseMsg.getStatus());
+    ToDeviceRpcRequestMetadata md = toDeviceRpcPendingMap.get(responseMsg.getRequestId());
+
+    if (md != null) {
+      JsonNode response = null;
+      if (status.equals(RpcStatus.DELIVERED)) {
+        if (md.getMsg().getMsg().isOneway()) {
+          toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
+          if (rpcSequential) {
+            systemContext
+                .getTbCoreDeviceRpcService()
+                .processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(rpcId, null, null));
+          }
         } else {
         } else {
-            sessions.forEach((sessionId, sessionMd) -> notifyTransportAboutClosedSession(sessionId, sessionMd, "device credentials updated!"));
-            attributeSubscriptions.clear();
-            rpcSubscriptions.clear();
-            dumpSessions();
-
+          md.setDelivered(true);
         }
         }
-    }
-
-    private void notifyTransportAboutClosedSessionMaxSessionsLimit(UUID sessionId, SessionInfoMetaData sessionMd) {
-        log.debug("remove eldest session (max concurrent sessions limit reached per device) sessionId [{}] sessionMd [{}]", sessionId, sessionMd);
-        notifyTransportAboutClosedSession(sessionId, sessionMd, "max concurrent sessions limit reached per device!");
-    }
-
-    private void notifyTransportAboutClosedSession(UUID sessionId, SessionInfoMetaData sessionMd, String message) {
-        SessionCloseNotificationProto sessionCloseNotificationProto = SessionCloseNotificationProto
-                .newBuilder()
-                .setMessage(message).build();
-        ToTransportMsg msg = ToTransportMsg.newBuilder()
-                .setSessionIdMSB(sessionId.getMostSignificantBits())
-                .setSessionIdLSB(sessionId.getLeastSignificantBits())
-                .setSessionCloseNotification(sessionCloseNotificationProto)
-                .build();
-        systemContext.getTbCoreToTransportService().process(sessionMd.getSessionInfo().getNodeId(), msg);
-    }
-
-    void notifyTransportAboutDeviceCredentialsUpdate(UUID sessionId, SessionInfoMetaData sessionMd, DeviceCredentials deviceCredentials) {
-        ToTransportUpdateCredentialsProto.Builder notification = ToTransportUpdateCredentialsProto.newBuilder();
-        notification.addCredentialsId(deviceCredentials.getCredentialsId());
-        notification.addCredentialsValue(deviceCredentials.getCredentialsValue());
-        ToTransportMsg msg = ToTransportMsg.newBuilder()
-                .setSessionIdMSB(sessionId.getMostSignificantBits())
-                .setSessionIdLSB(sessionId.getLeastSignificantBits())
-                .setToTransportUpdateCredentialsNotification(notification).build();
-        systemContext.getTbCoreToTransportService().process(sessionMd.getSessionInfo().getNodeId(), msg);
-    }
-
-    void processNameOrTypeUpdate(DeviceNameOrTypeUpdateMsg msg) {
-        this.deviceName = msg.getDeviceName();
-        this.deviceType = msg.getDeviceType();
-        this.defaultMetaData = new TbMsgMetaData();
-        this.defaultMetaData.putValue("deviceName", deviceName);
-        this.defaultMetaData.putValue("deviceType", deviceType);
-    }
-
-    void processEdgeUpdate(DeviceEdgeUpdateMsg msg) {
-        log.trace("[{}] Processing edge update {}", deviceId, msg);
-        this.edgeId = msg.getEdgeId();
-    }
-
-    private void sendToTransport(GetAttributeResponseMsg responseMsg, SessionInfoProto sessionInfo) {
-        ToTransportMsg msg = ToTransportMsg.newBuilder()
-                .setSessionIdMSB(sessionInfo.getSessionIdMSB())
-                .setSessionIdLSB(sessionInfo.getSessionIdLSB())
-                .setGetAttributesResponse(responseMsg).build();
-        systemContext.getTbCoreToTransportService().process(sessionInfo.getNodeId(), msg);
-    }
-
-    private void sendToTransport(AttributeUpdateNotificationMsg notificationMsg, UUID sessionId, String nodeId) {
-        ToTransportMsg msg = ToTransportMsg.newBuilder()
-                .setSessionIdMSB(sessionId.getMostSignificantBits())
-                .setSessionIdLSB(sessionId.getLeastSignificantBits())
-                .setAttributeUpdateNotification(notificationMsg).build();
-        systemContext.getTbCoreToTransportService().process(nodeId, msg);
-    }
-
-    private void sendToTransport(ToDeviceRpcRequestMsg rpcMsg, UUID sessionId, String nodeId) {
-        ToTransportMsg msg = ToTransportMsg.newBuilder()
-                .setSessionIdMSB(sessionId.getMostSignificantBits())
-                .setSessionIdLSB(sessionId.getLeastSignificantBits())
-                .setToDeviceRequest(rpcMsg).build();
-        systemContext.getTbCoreToTransportService().process(nodeId, msg);
-    }
-
-    private void sendToTransport(ToServerRpcResponseMsg rpcMsg, UUID sessionId, String nodeId) {
-        ToTransportMsg msg = ToTransportMsg.newBuilder()
-                .setSessionIdMSB(sessionId.getMostSignificantBits())
-                .setSessionIdLSB(sessionId.getLeastSignificantBits())
-                .setToServerResponse(rpcMsg).build();
-        systemContext.getTbCoreToTransportService().process(nodeId, msg);
-    }
-
-    private void saveRpcRequestToEdgeQueue(ToDeviceRpcRequest msg, Integer requestId) {
-        EdgeEvent edgeEvent = new EdgeEvent();
-        edgeEvent.setTenantId(tenantId);
-        edgeEvent.setAction(EdgeEventActionType.RPC_CALL);
-        edgeEvent.setEntityId(deviceId.getId());
-        edgeEvent.setType(EdgeEventType.DEVICE);
-
-        ObjectNode body = mapper.createObjectNode();
-        body.put("requestId", requestId);
-        body.put("requestUUID", msg.getId().toString());
-        body.put("oneway", msg.isOneway());
-        body.put("expirationTime", msg.getExpirationTime());
-        body.put("method", msg.getBody().getMethod());
-        body.put("params", msg.getBody().getParams());
-        edgeEvent.setBody(body);
-
-        edgeEvent.setEdgeId(edgeId);
-        systemContext.getEdgeEventService().save(edgeEvent);
-        systemContext.getClusterService().onEdgeEventUpdate(tenantId, edgeId);
-    }
-
-    private List<TsKvProto> toTsKvProtos(@Nullable List<AttributeKvEntry> result) {
-        List<TsKvProto> clientAttributes;
-        if (result == null || result.isEmpty()) {
-            clientAttributes = Collections.emptyList();
+      } else if (status.equals(RpcStatus.TIMEOUT)) {
+        Integer maxRpcRetries = md.getMsg().getMsg().getRetries();
+        maxRpcRetries =
+            maxRpcRetries == null
+                ? systemContext.getMaxRpcRetries()
+                : Math.min(maxRpcRetries, systemContext.getMaxRpcRetries());
+        if (maxRpcRetries <= md.getRetries()) {
+          toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
+          status = RpcStatus.FAILED;
+          response =
+              JacksonUtil.newObjectNode()
+                  .put(
+                      "error",
+                      "There was a Timeout and all retry attempts have been exhausted. Retry attempts set: "
+                          + maxRpcRetries);
         } else {
         } else {
-            clientAttributes = new ArrayList<>(result.size());
-            for (AttributeKvEntry attrEntry : result) {
-                clientAttributes.add(toTsKvProto(attrEntry));
-            }
-        }
-        return clientAttributes;
-    }
-
-    private TsKvProto toTsKvProto(AttributeKvEntry attrEntry) {
-        return TsKvProto.newBuilder().setTs(attrEntry.getLastUpdateTs())
-                .setKv(toKeyValueProto(attrEntry)).build();
-    }
-
-    private KeyValueProto toKeyValueProto(KvEntry kvEntry) {
-        KeyValueProto.Builder builder = KeyValueProto.newBuilder();
-        builder.setKey(kvEntry.getKey());
-        switch (kvEntry.getDataType()) {
-            case BOOLEAN:
-                builder.setType(KeyValueType.BOOLEAN_V);
-                builder.setBoolV(kvEntry.getBooleanValue().get());
-                break;
-            case DOUBLE:
-                builder.setType(KeyValueType.DOUBLE_V);
-                builder.setDoubleV(kvEntry.getDoubleValue().get());
-                break;
-            case LONG:
-                builder.setType(KeyValueType.LONG_V);
-                builder.setLongV(kvEntry.getLongValue().get());
-                break;
-            case STRING:
-                builder.setType(KeyValueType.STRING_V);
-                builder.setStringV(kvEntry.getStrValue().get());
-                break;
-            case JSON:
-                builder.setType(KeyValueType.JSON_V);
-                builder.setJsonV(kvEntry.getJsonValue().get());
-                break;
+          md.setRetries(md.getRetries() + 1);
         }
         }
-        return builder.build();
+      }
+
+      if (md.getMsg().getMsg().isPersisted()) {
+        systemContext.getTbRpcService().save(tenantId, new RpcId(rpcId), status, response);
+      }
+      if (status != RpcStatus.SENT) {
+        sendNextPendingRequest(context);
+      }
+    } else {
+      log.info("[{}][{}] Rpc has already removed from pending map.", deviceId, rpcId);
     }
     }
-
-    void restoreSessions() {
-        if (systemContext.isLocalCacheType()) {
-            return;
-        }
-        log.debug("[{}] Restoring sessions from cache", deviceId);
-        DeviceSessionsCacheEntry sessionsDump = null;
-        try {
-            sessionsDump = DeviceSessionsCacheEntry.parseFrom(systemContext.getDeviceSessionCacheService().get(deviceId));
-        } catch (InvalidProtocolBufferException e) {
-            log.warn("[{}] Failed to decode device sessions from cache", deviceId);
-            return;
-        }
-        if (sessionsDump.getSessionsCount() == 0) {
-            log.debug("[{}] No session information found", deviceId);
-            return;
-        }
-        // TODO: Take latest max allowed sessions size from cache
-        for (SessionSubscriptionInfoProto sessionSubscriptionInfoProto : sessionsDump.getSessionsList()) {
-            SessionInfoProto sessionInfoProto = sessionSubscriptionInfoProto.getSessionInfo();
-            UUID sessionId = getSessionId(sessionInfoProto);
-            SessionInfo sessionInfo = new SessionInfo(SessionType.ASYNC, sessionInfoProto.getNodeId());
-            SubscriptionInfoProto subInfo = sessionSubscriptionInfoProto.getSubscriptionInfo();
-            SessionInfoMetaData sessionMD = new SessionInfoMetaData(sessionInfo, subInfo.getLastActivityTime());
-            sessions.put(sessionId, sessionMD);
-            if (subInfo.getAttributeSubscription()) {
-                attributeSubscriptions.put(sessionId, sessionInfo);
-                sessionMD.setSubscribedToAttributes(true);
-            }
-            if (subInfo.getRpcSubscription()) {
-                rpcSubscriptions.put(sessionId, sessionInfo);
-                sessionMD.setSubscribedToRPC(true);
-            }
-            log.debug("[{}] Restored session: {}", deviceId, sessionMD);
-        }
-        log.debug("[{}] Restored sessions: {}, rpc subscriptions: {}, attribute subscriptions: {}", deviceId, sessions.size(), rpcSubscriptions.size(), attributeSubscriptions.size());
+  }
+
+  private void processSubscriptionCommands(
+      TbActorCtx context,
+      SessionInfoProto sessionInfo,
+      SubscribeToAttributeUpdatesMsg subscribeCmd) {
+    UUID sessionId = getSessionId(sessionInfo);
+    if (subscribeCmd.getUnsubscribe()) {
+      log.debug("[{}] Canceling attributes subscription for session [{}]", deviceId, sessionId);
+      attributeSubscriptions.remove(sessionId);
+    } else {
+      SessionInfoMetaData sessionMD = sessions.get(sessionId);
+      if (sessionMD == null) {
+        sessionMD =
+            new SessionInfoMetaData(
+                new SessionInfo(subscribeCmd.getSessionType(), sessionInfo.getNodeId()));
+      }
+      sessionMD.setSubscribedToAttributes(true);
+      log.debug("[{}] Registering attributes subscription for session [{}]", deviceId, sessionId);
+      attributeSubscriptions.put(sessionId, sessionMD.getSessionInfo());
+      dumpSessions();
+    }
+  }
+
+  private UUID getSessionId(SessionInfoProto sessionInfo) {
+    return new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB());
+  }
+
+  private void processSubscriptionCommands(
+      TbActorCtx context, SessionInfoProto sessionInfo, SubscribeToRPCMsg subscribeCmd) {
+    UUID sessionId = getSessionId(sessionInfo);
+    if (subscribeCmd.getUnsubscribe()) {
+      log.debug("[{}] Canceling rpc subscription for session [{}]", deviceId, sessionId);
+      rpcSubscriptions.remove(sessionId);
+    } else {
+      SessionInfoMetaData sessionMD = sessions.get(sessionId);
+      if (sessionMD == null) {
+        sessionMD =
+            new SessionInfoMetaData(
+                new SessionInfo(subscribeCmd.getSessionType(), sessionInfo.getNodeId()));
+      }
+      sessionMD.setSubscribedToRPC(true);
+      log.debug("[{}] Registering rpc subscription for session [{}]", deviceId, sessionId);
+      rpcSubscriptions.put(sessionId, sessionMD.getSessionInfo());
+      sendPendingRequests(context, sessionId, sessionInfo.getNodeId());
+      dumpSessions();
+    }
+  }
+
+  private void processSessionStateMsgs(SessionInfoProto sessionInfo, SessionEventMsg msg) {
+    UUID sessionId = getSessionId(sessionInfo);
+    Objects.requireNonNull(sessionId);
+    if (msg.getEvent() == SessionEvent.OPEN) {
+      if (sessions.containsKey(sessionId)) {
+        log.debug("[{}] Received duplicate session open event [{}]", deviceId, sessionId);
+        return;
+      }
+      log.debug(
+          "[{}] Processing new session [{}]. Current sessions size {}",
+          deviceId,
+          sessionId,
+          sessions.size());
+
+      sessions.put(
+          sessionId,
+          new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfo.getNodeId())));
+      if (sessions.size() == 1) {
+        reportSessionOpen();
+      }
+      systemContext
+          .getDeviceStateService()
+          .onDeviceActivity(tenantId, deviceId, System.currentTimeMillis());
+      dumpSessions();
+    } else if (msg.getEvent() == SessionEvent.CLOSED) {
+      log.debug("[{}] Canceling subscriptions for closed session [{}]", deviceId, sessionId);
+      sessions.remove(sessionId);
+      attributeSubscriptions.remove(sessionId);
+      rpcSubscriptions.remove(sessionId);
+      if (sessions.isEmpty()) {
+        reportSessionClose();
+      }
+      dumpSessions();
+    }
+  }
+
+  private void handleSessionActivity(
+      TbActorCtx context,
+      SessionInfoProto sessionInfoProto,
+      SubscriptionInfoProto subscriptionInfo) {
+    UUID sessionId = getSessionId(sessionInfoProto);
+    Objects.requireNonNull(sessionId);
+
+    SessionInfoMetaData sessionMD = sessions.get(sessionId);
+    if (sessionMD != null) {
+      sessionMD.setLastActivityTime(subscriptionInfo.getLastActivityTime());
+      sessionMD.setSubscribedToAttributes(subscriptionInfo.getAttributeSubscription());
+      sessionMD.setSubscribedToRPC(subscriptionInfo.getRpcSubscription());
+      if (subscriptionInfo.getAttributeSubscription()) {
+        attributeSubscriptions.putIfAbsent(sessionId, sessionMD.getSessionInfo());
+      }
+      if (subscriptionInfo.getRpcSubscription()) {
+        rpcSubscriptions.putIfAbsent(sessionId, sessionMD.getSessionInfo());
+      }
     }
     }
+    systemContext
+        .getDeviceStateService()
+        .onDeviceActivity(tenantId, deviceId, subscriptionInfo.getLastActivityTime());
+    if (sessionMD != null) {
+      dumpSessions();
+    }
+  }
+
+  void processCredentialsUpdate(TbActorMsg msg) {
+    if (((DeviceCredentialsUpdateNotificationMsg) msg).getDeviceCredentials().getCredentialsType()
+        == DeviceCredentialsType.LWM2M_CREDENTIALS) {
+      sessions.forEach(
+          (k, v) -> {
+            notifyTransportAboutDeviceCredentialsUpdate(
+                k, v, ((DeviceCredentialsUpdateNotificationMsg) msg).getDeviceCredentials());
+          });
+    } else {
+      sessions.forEach(
+          (sessionId, sessionMd) ->
+              notifyTransportAboutClosedSession(
+                  sessionId, sessionMd, "device credentials updated!"));
+      attributeSubscriptions.clear();
+      rpcSubscriptions.clear();
+      dumpSessions();
+    }
+  }
+
+  private void notifyTransportAboutClosedSessionMaxSessionsLimit(
+      UUID sessionId, SessionInfoMetaData sessionMd) {
+    log.debug(
+        "remove eldest session (max concurrent sessions limit reached per device) sessionId [{}] sessionMd [{}]",
+        sessionId,
+        sessionMd);
+    notifyTransportAboutClosedSession(
+        sessionId, sessionMd, "max concurrent sessions limit reached per device!");
+  }
+
+  private void notifyTransportAboutClosedSession(
+      UUID sessionId, SessionInfoMetaData sessionMd, String message) {
+    SessionCloseNotificationProto sessionCloseNotificationProto =
+        SessionCloseNotificationProto.newBuilder().setMessage(message).build();
+    ToTransportMsg msg =
+        ToTransportMsg.newBuilder()
+            .setSessionIdMSB(sessionId.getMostSignificantBits())
+            .setSessionIdLSB(sessionId.getLeastSignificantBits())
+            .setSessionCloseNotification(sessionCloseNotificationProto)
+            .build();
+    systemContext
+        .getTbCoreToTransportService()
+        .process(sessionMd.getSessionInfo().getNodeId(), msg);
+  }
+
+  void notifyTransportAboutDeviceCredentialsUpdate(
+      UUID sessionId, SessionInfoMetaData sessionMd, DeviceCredentials deviceCredentials) {
+    ToTransportUpdateCredentialsProto.Builder notification =
+        ToTransportUpdateCredentialsProto.newBuilder();
+    notification.addCredentialsId(deviceCredentials.getCredentialsId());
+    notification.addCredentialsValue(deviceCredentials.getCredentialsValue());
+    ToTransportMsg msg =
+        ToTransportMsg.newBuilder()
+            .setSessionIdMSB(sessionId.getMostSignificantBits())
+            .setSessionIdLSB(sessionId.getLeastSignificantBits())
+            .setToTransportUpdateCredentialsNotification(notification)
+            .build();
+    systemContext
+        .getTbCoreToTransportService()
+        .process(sessionMd.getSessionInfo().getNodeId(), msg);
+  }
+
+  void processNameOrTypeUpdate(DeviceNameOrTypeUpdateMsg msg) {
+    this.deviceName = msg.getDeviceName();
+    this.deviceType = msg.getDeviceType();
+    this.defaultMetaData = new TbMsgMetaData();
+    this.defaultMetaData.putValue("deviceName", deviceName);
+    this.defaultMetaData.putValue("deviceType", deviceType);
+  }
+
+  void processEdgeUpdate(DeviceEdgeUpdateMsg msg) {
+    log.trace("[{}] Processing edge update {}", deviceId, msg);
+    this.edgeId = msg.getEdgeId();
+  }
+
+  private void sendToTransport(GetAttributeResponseMsg responseMsg, SessionInfoProto sessionInfo) {
+    ToTransportMsg msg =
+        ToTransportMsg.newBuilder()
+            .setSessionIdMSB(sessionInfo.getSessionIdMSB())
+            .setSessionIdLSB(sessionInfo.getSessionIdLSB())
+            .setGetAttributesResponse(responseMsg)
+            .build();
+    systemContext.getTbCoreToTransportService().process(sessionInfo.getNodeId(), msg);
+  }
+
+  private void sendToTransport(
+      AttributeUpdateNotificationMsg notificationMsg, UUID sessionId, String nodeId) {
+    ToTransportMsg msg =
+        ToTransportMsg.newBuilder()
+            .setSessionIdMSB(sessionId.getMostSignificantBits())
+            .setSessionIdLSB(sessionId.getLeastSignificantBits())
+            .setAttributeUpdateNotification(notificationMsg)
+            .build();
+    systemContext.getTbCoreToTransportService().process(nodeId, msg);
+  }
+
+  private void sendToTransport(ToDeviceRpcRequestMsg rpcMsg, UUID sessionId, String nodeId) {
+    ToTransportMsg msg =
+        ToTransportMsg.newBuilder()
+            .setSessionIdMSB(sessionId.getMostSignificantBits())
+            .setSessionIdLSB(sessionId.getLeastSignificantBits())
+            .setToDeviceRequest(rpcMsg)
+            .build();
+    systemContext.getTbCoreToTransportService().process(nodeId, msg);
+  }
+
+  private void sendToTransport(ToServerRpcResponseMsg rpcMsg, UUID sessionId, String nodeId) {
+    ToTransportMsg msg =
+        ToTransportMsg.newBuilder()
+            .setSessionIdMSB(sessionId.getMostSignificantBits())
+            .setSessionIdLSB(sessionId.getLeastSignificantBits())
+            .setToServerResponse(rpcMsg)
+            .build();
+    systemContext.getTbCoreToTransportService().process(nodeId, msg);
+  }
+
+  private void saveRpcRequestToEdgeQueue(ToDeviceRpcRequest msg, Integer requestId) {
+    EdgeEvent edgeEvent = new EdgeEvent();
+    edgeEvent.setTenantId(tenantId);
+    edgeEvent.setAction(EdgeEventActionType.RPC_CALL);
+    edgeEvent.setEntityId(deviceId.getId());
+    edgeEvent.setType(EdgeEventType.DEVICE);
+
+    ObjectNode body = mapper.createObjectNode();
+    body.put("requestId", requestId);
+    body.put("requestUUID", msg.getId().toString());
+    body.put("oneway", msg.isOneway());
+    body.put("expirationTime", msg.getExpirationTime());
+    body.put("method", msg.getBody().getMethod());
+    body.put("params", msg.getBody().getParams());
+    edgeEvent.setBody(body);
+
+    edgeEvent.setEdgeId(edgeId);
+    systemContext.getEdgeEventService().save(edgeEvent);
+    systemContext.getClusterService().onEdgeEventUpdate(tenantId, edgeId);
+  }
+
+  private List<TsKvProto> toTsKvProtos(@Nullable List<AttributeKvEntry> result) {
+    List<TsKvProto> clientAttributes;
+    if (result == null || result.isEmpty()) {
+      clientAttributes = Collections.emptyList();
+    } else {
+      clientAttributes = new ArrayList<>(result.size());
+      for (AttributeKvEntry attrEntry : result) {
+        clientAttributes.add(toTsKvProto(attrEntry));
+      }
+    }
+    return clientAttributes;
+  }
+
+  private TsKvProto toTsKvProto(AttributeKvEntry attrEntry) {
+    return TsKvProto.newBuilder()
+        .setTs(attrEntry.getLastUpdateTs())
+        .setKv(toKeyValueProto(attrEntry))
+        .build();
+  }
+
+  private KeyValueProto toKeyValueProto(KvEntry kvEntry) {
+    KeyValueProto.Builder builder = KeyValueProto.newBuilder();
+    builder.setKey(kvEntry.getKey());
+    switch (kvEntry.getDataType()) {
+      case BOOLEAN:
+        builder.setType(KeyValueType.BOOLEAN_V);
+        builder.setBoolV(kvEntry.getBooleanValue().get());
+        break;
+      case DOUBLE:
+        builder.setType(KeyValueType.DOUBLE_V);
+        builder.setDoubleV(kvEntry.getDoubleValue().get());
+        break;
+      case LONG:
+        builder.setType(KeyValueType.LONG_V);
+        builder.setLongV(kvEntry.getLongValue().get());
+        break;
+      case STRING:
+        builder.setType(KeyValueType.STRING_V);
+        builder.setStringV(kvEntry.getStrValue().get());
+        break;
+      case JSON:
+        builder.setType(KeyValueType.JSON_V);
+        builder.setJsonV(kvEntry.getJsonValue().get());
+        break;
+    }
+    return builder.build();
+  }
 
 
-    private void dumpSessions() {
-        if (systemContext.isLocalCacheType()) {
+  void restoreSessions() {
+    if (systemContext.isLocalCacheType()) {
+      return;
+    }
+    log.debug("[{}] Restoring sessions from cache", deviceId);
+    DeviceSessionsCacheEntry sessionsDump = null;
+    try {
+      sessionsDump =
+          DeviceSessionsCacheEntry.parseFrom(
+              systemContext.getDeviceSessionCacheService().get(deviceId));
+    } catch (InvalidProtocolBufferException e) {
+      log.warn("[{}] Failed to decode device sessions from cache", deviceId);
+      return;
+    }
+    if (sessionsDump.getSessionsCount() == 0) {
+      log.debug("[{}] No session information found", deviceId);
+      return;
+    }
+    // TODO: Take latest max allowed sessions size from cache
+    for (SessionSubscriptionInfoProto sessionSubscriptionInfoProto :
+        sessionsDump.getSessionsList()) {
+      SessionInfoProto sessionInfoProto = sessionSubscriptionInfoProto.getSessionInfo();
+      UUID sessionId = getSessionId(sessionInfoProto);
+      SessionInfo sessionInfo = new SessionInfo(SessionType.ASYNC, sessionInfoProto.getNodeId());
+      SubscriptionInfoProto subInfo = sessionSubscriptionInfoProto.getSubscriptionInfo();
+      SessionInfoMetaData sessionMD =
+          new SessionInfoMetaData(sessionInfo, subInfo.getLastActivityTime());
+      sessions.put(sessionId, sessionMD);
+      if (subInfo.getAttributeSubscription()) {
+        attributeSubscriptions.put(sessionId, sessionInfo);
+        sessionMD.setSubscribedToAttributes(true);
+      }
+      if (subInfo.getRpcSubscription()) {
+        rpcSubscriptions.put(sessionId, sessionInfo);
+        sessionMD.setSubscribedToRPC(true);
+      }
+      log.debug("[{}] Restored session: {}", deviceId, sessionMD);
+    }
+    log.debug(
+        "[{}] Restored sessions: {}, rpc subscriptions: {}, attribute subscriptions: {}",
+        deviceId,
+        sessions.size(),
+        rpcSubscriptions.size(),
+        attributeSubscriptions.size());
+  }
+
+  private void dumpSessions() {
+    if (systemContext.isLocalCacheType()) {
+      return;
+    }
+    log.debug(
+        "[{}] Dumping sessions: {}, rpc subscriptions: {}, attribute subscriptions: {} to cache",
+        deviceId,
+        sessions.size(),
+        rpcSubscriptions.size(),
+        attributeSubscriptions.size());
+    List<SessionSubscriptionInfoProto> sessionsList = new ArrayList<>(sessions.size());
+    sessions.forEach(
+        (uuid, sessionMD) -> {
+          if (sessionMD.getSessionInfo().getType() == SessionType.SYNC) {
             return;
             return;
-        }
-        log.debug("[{}] Dumping sessions: {}, rpc subscriptions: {}, attribute subscriptions: {} to cache", deviceId, sessions.size(), rpcSubscriptions.size(), attributeSubscriptions.size());
-        List<SessionSubscriptionInfoProto> sessionsList = new ArrayList<>(sessions.size());
-        sessions.forEach((uuid, sessionMD) -> {
-            if (sessionMD.getSessionInfo().getType() == SessionType.SYNC) {
-                return;
-            }
-            SessionInfo sessionInfo = sessionMD.getSessionInfo();
-            SubscriptionInfoProto subscriptionInfoProto = SubscriptionInfoProto.newBuilder()
-                    .setLastActivityTime(sessionMD.getLastActivityTime())
-                    .setAttributeSubscription(sessionMD.isSubscribedToAttributes())
-                    .setRpcSubscription(sessionMD.isSubscribedToRPC()).build();
-            SessionInfoProto sessionInfoProto = SessionInfoProto.newBuilder()
-                    .setSessionIdMSB(uuid.getMostSignificantBits())
-                    .setSessionIdLSB(uuid.getLeastSignificantBits())
-                    .setNodeId(sessionInfo.getNodeId()).build();
-            sessionsList.add(SessionSubscriptionInfoProto.newBuilder()
-                    .setSessionInfo(sessionInfoProto)
-                    .setSubscriptionInfo(subscriptionInfoProto).build());
-            log.debug("[{}] Dumping session: {}", deviceId, sessionMD);
+          }
+          SessionInfo sessionInfo = sessionMD.getSessionInfo();
+          SubscriptionInfoProto subscriptionInfoProto =
+              SubscriptionInfoProto.newBuilder()
+                  .setLastActivityTime(sessionMD.getLastActivityTime())
+                  .setAttributeSubscription(sessionMD.isSubscribedToAttributes())
+                  .setRpcSubscription(sessionMD.isSubscribedToRPC())
+                  .build();
+          SessionInfoProto sessionInfoProto =
+              SessionInfoProto.newBuilder()
+                  .setSessionIdMSB(uuid.getMostSignificantBits())
+                  .setSessionIdLSB(uuid.getLeastSignificantBits())
+                  .setNodeId(sessionInfo.getNodeId())
+                  .build();
+          sessionsList.add(
+              SessionSubscriptionInfoProto.newBuilder()
+                  .setSessionInfo(sessionInfoProto)
+                  .setSubscriptionInfo(subscriptionInfoProto)
+                  .build());
+          log.debug("[{}] Dumping session: {}", deviceId, sessionMD);
         });
         });
-        systemContext.getDeviceSessionCacheService()
-                .put(deviceId, DeviceSessionsCacheEntry.newBuilder()
-                        .addAllSessions(sessionsList).build().toByteArray());
-    }
-
-    void init(TbActorCtx ctx) {
-        PageLink pageLink = new PageLink(1024, 0, null, new SortOrder("createdTime"));
-        PageData<Rpc> pageData;
-        do {
-            pageData = systemContext.getTbRpcService().findAllByDeviceIdAndStatus(tenantId, deviceId, RpcStatus.QUEUED, pageLink);
-            pageData.getData().forEach(rpc -> {
-                ToDeviceRpcRequest msg = JacksonUtil.convertValue(rpc.getRequest(), ToDeviceRpcRequest.class);
+    systemContext
+        .getDeviceSessionCacheService()
+        .put(
+            deviceId,
+            DeviceSessionsCacheEntry.newBuilder()
+                .addAllSessions(sessionsList)
+                .build()
+                .toByteArray());
+  }
+
+  void init(TbActorCtx ctx) {
+    PageLink pageLink = new PageLink(1024, 0, null, new SortOrder("createdTime"));
+    PageData<Rpc> pageData;
+    do {
+      pageData =
+          systemContext
+              .getTbRpcService()
+              .findAllByDeviceIdAndStatus(tenantId, deviceId, RpcStatus.QUEUED, pageLink);
+      pageData
+          .getData()
+          .forEach(
+              rpc -> {
+                ToDeviceRpcRequest msg =
+                    JacksonUtil.convertValue(rpc.getRequest(), ToDeviceRpcRequest.class);
                 long timeout = rpc.getExpirationTime() - System.currentTimeMillis();
                 long timeout = rpc.getExpirationTime() - System.currentTimeMillis();
                 if (timeout <= 0) {
                 if (timeout <= 0) {
-                    rpc.setStatus(RpcStatus.EXPIRED);
-                    systemContext.getTbRpcService().save(tenantId, rpc);
+                  rpc.setStatus(RpcStatus.EXPIRED);
+                  systemContext.getTbRpcService().save(tenantId, rpc);
                 } else {
                 } else {
-                    registerPendingRpcRequest(ctx, new ToDeviceRpcRequestActorMsg(systemContext.getServiceId(), msg), false, creteToDeviceRpcRequestMsg(msg), timeout);
-                }
-            });
-            if (pageData.hasNext()) {
-                pageLink = pageLink.nextPageLink();
-            }
-        } while (pageData.hasNext());
-    }
-
-    void checkSessionsTimeout() {
-        final long expTime = System.currentTimeMillis() - systemContext.getSessionInactivityTimeout();
-        List<UUID> expiredIds = null;
-
-        for (Map.Entry<UUID, SessionInfoMetaData> kv : sessions.entrySet()) { //entry set are cached for stable sessions
-            if (kv.getValue().getLastActivityTime() < expTime) {
-                final UUID id = kv.getKey();
-                if (expiredIds == null) {
-                    expiredIds = new ArrayList<>(1); //most of the expired sessions is a single event
+                  registerPendingRpcRequest(
+                      ctx,
+                      new ToDeviceRpcRequestActorMsg(systemContext.getServiceId(), msg),
+                      false,
+                      creteToDeviceRpcRequestMsg(msg),
+                      timeout);
                 }
                 }
-                expiredIds.add(id);
-            }
+              });
+      if (pageData.hasNext()) {
+        pageLink = pageLink.nextPageLink();
+      }
+    } while (pageData.hasNext());
+  }
+
+  void checkSessionsTimeout() {
+    final long expTime = System.currentTimeMillis() - systemContext.getSessionInactivityTimeout();
+    List<UUID> expiredIds = null;
+
+    for (Map.Entry<UUID, SessionInfoMetaData> kv :
+        sessions.entrySet()) { // entry set are cached for stable sessions
+      if (kv.getValue().getLastActivityTime() < expTime) {
+        final UUID id = kv.getKey();
+        if (expiredIds == null) {
+          expiredIds = new ArrayList<>(1); // most of the expired sessions is a single event
         }
         }
+        expiredIds.add(id);
+      }
+    }
 
 
-        if (expiredIds != null) {
-            int removed = 0;
-            for (UUID id : expiredIds) {
-                final SessionInfoMetaData session = sessions.remove(id);
-                rpcSubscriptions.remove(id);
-                attributeSubscriptions.remove(id);
-                if (session != null) {
-                    removed++;
-                    notifyTransportAboutClosedSession(id, session, SESSION_TIMEOUT_MESSAGE);
-                }
-            }
-            if (removed != 0) {
-                dumpSessions();
-            }
+    if (expiredIds != null) {
+      int removed = 0;
+      for (UUID id : expiredIds) {
+        final SessionInfoMetaData session = sessions.remove(id);
+        rpcSubscriptions.remove(id);
+        attributeSubscriptions.remove(id);
+        if (session != null) {
+          removed++;
+          notifyTransportAboutClosedSession(id, session, SESSION_TIMEOUT_MESSAGE);
         }
         }
-
+      }
+      if (removed != 0) {
+        dumpSessions();
+      }
     }
     }
-
+  }
 }
 }

@@ -78,6 +78,7 @@ import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
@@ -689,4 +690,10 @@ class DefaultTbContext implements TbContext {
             }
             }
         }
         }
     }
     }
+
+    //Thingskit function
+    @Override
+    public TkDeviceService getTkDeviceService() {
+        return mainCtx.getTkDeviceService();
+    }
 }
 }

@@ -17,8 +17,8 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.id.SceneId;
 import org.thingsboard.server.common.data.yunteng.id.SceneId;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;

@@ -21,27 +21,19 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.rpc.RpcError;
 import org.thingsboard.server.common.data.rpc.RpcError;
-import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
-import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
 import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.DeviceService;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -79,8 +71,6 @@ public class DefaultTbCoreDeviceRpcService implements TbCoreDeviceRpcService {
     private ScheduledExecutorService scheduler;
     private ScheduledExecutorService scheduler;
     private String serviceId;
     private String serviceId;
 
 
-    @Autowired
-    protected TkDeviceService tkDeviceService;
     public DefaultTbCoreDeviceRpcService(DeviceService deviceService, TbClusterService clusterService, TbServiceInfoProvider serviceInfoProvider,
     public DefaultTbCoreDeviceRpcService(DeviceService deviceService, TbClusterService clusterService, TbServiceInfoProvider serviceInfoProvider,
                                          ActorSystemContext actorContext) {
                                          ActorSystemContext actorContext) {
         this.deviceService = deviceService;
         this.deviceService = deviceService;
@@ -110,32 +100,6 @@ public class DefaultTbCoreDeviceRpcService implements TbCoreDeviceRpcService {
     @Override
     @Override
     public void processRestApiRpcRequest(ToDeviceRpcRequest request, Consumer<FromDeviceRpcResponse> responseConsumer, SecurityUser currentUser) {
     public void processRestApiRpcRequest(ToDeviceRpcRequest request, Consumer<FromDeviceRpcResponse> responseConsumer, SecurityUser currentUser) {
         log.trace("[{}][{}] Processing REST API call to rule engine [{}]", request.getTenantId(), request.getId(), request.getDeviceId());
         log.trace("[{}][{}] Processing REST API call to rule engine [{}]", request.getTenantId(), request.getId(), request.getDeviceId());
-
-        //Thingskit function 修改RPC三要素：设备ID、参数、附加信息
-        //只有命令下发的时候走此逻辑,其他method的时候不走以下逻辑
-        ToDeviceRpcRequestBody body = request.getBody();
-        if(body.getMethod().contains("method"))
-        {
-            DeviceId targetId = request.getDeviceId();
-            DeviceDTO targetDevice = tkDeviceService.findDeviceInfoByTbDeviceId(currentUser.getCurrentTenantId(), targetId.getId().toString());
-            DeviceId netEnableId = DeviceTypeEnum.SENSOR == targetDevice.getDeviceType()?new DeviceId(UUID.fromString(targetDevice.getGatewayId())):targetId;
-            String paramStr = body.getParams();
-            if(DeviceTypeEnum.SENSOR == targetDevice.getDeviceType() && paramStr.contains("}")){
-                ObjectNode methodParams = (ObjectNode) JacksonUtil.toJsonNode(paramStr);
-                methodParams.put(FastIotConstants.Rpc.TARGET_NAME,targetDevice.getName());
-                body = new ToDeviceRpcRequestBody(body.getMethod(),JacksonUtil.toString(methodParams));
-            }
-
-            ObjectNode additional = JacksonUtil.newObjectNode();
-            if(StringUtils.isNotBlank(request.getAdditionalInfo())){
-                additional = (ObjectNode) JacksonUtil.toJsonNode(request.getAdditionalInfo());
-            }
-            if(!additional.has(FastIotConstants.Rpc.TARGET_ID)){
-                additional.put(FastIotConstants.Rpc.TARGET_ID, targetId.getId().toString());
-            }
-            request = new ToDeviceRpcRequest(request.getId(),request.getTenantId(),netEnableId,request.isOneway(),request.getExpirationTime(),body,request.isPersisted(),request.getRetries(),JacksonUtil.toString(additional));
-
-        }
         UUID requestId = request.getId();
         UUID requestId = request.getId();
         localToRuleEngineRpcRequests.put(requestId, responseConsumer);
         localToRuleEngineRpcRequests.put(requestId, responseConsumer);
         sendRpcRequestToRuleEngine(request, currentUser);
         sendRpcRequestToRuleEngine(request, currentUser);

@@ -3,6 +3,7 @@ package org.thingsboard.server.common.data.yunteng.dto;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 
 
 import java.util.List;
 import java.util.List;
 
 

-package org.thingsboard.server.common.data.yunteng.dto;
+package org.thingsboard.server.common.data.yunteng.dto.scene;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;

-package org.thingsboard.server.common.data.yunteng.dto;
+package org.thingsboard.server.common.data.yunteng.dto.scene;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 
 
-import java.util.List;
-
 /**
 /**
  * @Description 场景联动执行条件数据传输表 @Author cxy @Date 2021/11/24 17:33
  * @Description 场景联动执行条件数据传输表 @Author cxy @Date 2021/11/24 17:33
  */
  */

+package org.thingsboard.server.common.data.yunteng.dto.scene;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
+
+/**
+ * @Description 场景联动执行动作数据传输表 @Author cxy @Date 2021/11/24 17:32
+ */
+@Data
+public class RuleFilterDTO implements Serializable {
+
+  @ApiModelProperty(value = "触发条件ID")
+  private String ruleId;
+
+  @ApiModelProperty(value = "场景联动ID")
+  private String scenId;
+
+}

-package org.thingsboard.server.common.data.yunteng.dto;
+package org.thingsboard.server.common.data.yunteng.dto.scene;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.List;

-package org.thingsboard.server.common.data.yunteng.dto;
+package org.thingsboard.server.common.data.yunteng.dto.scene;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;

@@ -13,6 +13,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.NoneTenantAsset
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmProfileEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmProfileEntity;

@@ -7,7 +7,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.*;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -16,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.scene.*;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
@@ -27,13 +30,13 @@ import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.*;
 import org.thingsboard.server.dao.yunteng.service.*;
 
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-/** @Description 场景联动业务实现层 @Author cxy @Date 2021/11/25 11:22 */
+/**
+ * @Description 场景联动业务实现层 @Author cxy @Date 2021/11/25 11:22
+ */
 @Service
 @Service
 @RequiredArgsConstructor
 @RequiredArgsConstructor
-public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMapper, TkSceneLinkageEntity>
+public class TkSceneLinkageServiceImpl
+    extends AbstractBaseService<SceneLinkageMapper, TkSceneLinkageEntity>
     implements SceneLinkageService {
     implements SceneLinkageService {
 
 
   private final SceneLinkageMapper sceneLinkageMapper;
   private final SceneLinkageMapper sceneLinkageMapper;
@@ -74,14 +77,20 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
 
 
   /**
   /**
    * 更新场景联动附加信息，触发器、执行条件、动作
    * 更新场景联动附加信息，触发器、执行条件、动作
-   * @param sceneLinkageDTO  场景联动表单数据
-   * @param tenantId     租户ID
+   *
+   * @param sceneLinkageDTO 场景联动表单数据
+   * @param tenantId 租户ID
    * @param customerId 客户ID
    * @param customerId 客户ID
    * @param sceneLinkage 场景联动主表实体
    * @param sceneLinkage 场景联动主表实体
    */
    */
-  private void updateScene(SceneLinkageDTO sceneLinkageDTO, String tenantId, String customerId, TkSceneLinkageEntity sceneLinkage) {
+  private void updateScene(
+      SceneLinkageDTO sceneLinkageDTO,
+      String tenantId,
+      String customerId,
+      TkSceneLinkageEntity sceneLinkage) {
     String organizationId = sceneLinkage.getOrganizationId();
     String organizationId = sceneLinkage.getOrganizationId();
-    List<DeviceDTO> organizationDevices = findDeviceList(organizationId, tenantId, customerId,new ArrayList<>());
+    List<DeviceDTO> organizationDevices =
+        findDeviceList(organizationId, tenantId, customerId, new ArrayList<>());
 
 
     List<String> tbDeviceIds = new ArrayList<>();
     List<String> tbDeviceIds = new ArrayList<>();
     for (DeviceDTO item : organizationDevices) {
     for (DeviceDTO item : organizationDevices) {
@@ -105,7 +114,8 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
         new QueryWrapper<TkSceneLinkageEntity>()
         new QueryWrapper<TkSceneLinkageEntity>()
             .lambda()
             .lambda()
             .eq(TkSceneLinkageEntity::getTenantId, tenantId)
             .eq(TkSceneLinkageEntity::getTenantId, tenantId)
-//            .eq(StringUtils.isNotBlank(currentUserId),SceneLinkage::getCreator, currentUserId)
+            //            .eq(StringUtils.isNotBlank(currentUserId),SceneLinkage::getCreator,
+            // currentUserId)
             .in(TkSceneLinkageEntity::getId, ids);
             .in(TkSceneLinkageEntity::getId, ids);
     int result = sceneLinkageMapper.delete(Wrapper);
     int result = sceneLinkageMapper.delete(Wrapper);
     if (result != ids.size()) {
     if (result != ids.size()) {
@@ -239,19 +249,22 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
                     doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
                     doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
                     doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
                     doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
                     if (ActionTypeEnum.DEVICE_OUT.equals(doActionDTO.getOutTarget())) {
                     if (ActionTypeEnum.DEVICE_OUT.equals(doActionDTO.getOutTarget())) {
-                      JsonNode inputContext = doActionDTO.getDoContext().get(FastIotConstants.Rpc.PARAMS_NAME);
+                      JsonNode inputContext =
+                          doActionDTO.getDoContext().get(FastIotConstants.Rpc.PARAMS_NAME);
                       ObjectNode outputContext = JacksonUtil.newObjectNode();
                       ObjectNode outputContext = JacksonUtil.newObjectNode();
                       outputContext.put(FastIotConstants.Rpc.METHOD_NAME, "methodThingskit");
                       outputContext.put(FastIotConstants.Rpc.METHOD_NAME, "methodThingskit");
-                      if(inputContext == null){
-                        outputContext.put(FastIotConstants.Rpc.PARAMS_NAME,"");
-                      }else if(inputContext.isTextual()){
-                        outputContext.put(FastIotConstants.Rpc.PARAMS_NAME,inputContext.asText());
-                      }else{
+                      if (inputContext == null) {
+                        outputContext.put(FastIotConstants.Rpc.PARAMS_NAME, "");
+                      } else if (inputContext.isTextual()) {
+                        outputContext.put(FastIotConstants.Rpc.PARAMS_NAME, inputContext.asText());
+                      } else {
                         outputContext.set(FastIotConstants.Rpc.PARAMS_NAME, inputContext);
                         outputContext.set(FastIotConstants.Rpc.PARAMS_NAME, inputContext);
                       }
                       }
 
 
                       ObjectNode addtionalInfo = JacksonUtil.newObjectNode();
                       ObjectNode addtionalInfo = JacksonUtil.newObjectNode();
-                      addtionalInfo.put(ModelConstants.TablePropertyMapping.COMMAND_TYPE, doActionDTO.getCommandType());
+                      addtionalInfo.put(
+                          ModelConstants.TablePropertyMapping.COMMAND_TYPE,
+                          doActionDTO.getCommandType());
                       outputContext.set(DataConstants.ADDITIONAL_INFO, addtionalInfo);
                       outputContext.set(DataConstants.ADDITIONAL_INFO, addtionalInfo);
                       doActionDTO.setDoContext(outputContext);
                       doActionDTO.setDoContext(outputContext);
                     }
                     }
@@ -264,11 +277,13 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
 
 
   /**
   /**
    * 验证设备输出的目标设备是否合法有效
    * 验证设备输出的目标设备是否合法有效
-   * @param tbDeviceIds  场景联动所属组织的全部设备ID
-   * @param deviceIds    场景联动选择的设备ID
-   * @param entityType   设备输出类型
+   *
+   * @param tbDeviceIds 场景联动所属组织的全部设备ID
+   * @param deviceIds 场景联动选择的设备ID
+   * @param entityType 设备输出类型
    */
    */
-  private void validateRpcDevice(List<String> tbDeviceIds, List<String> deviceIds, ScopeEnum entityType) {
+  private void validateRpcDevice(
+      List<String> tbDeviceIds, List<String> deviceIds, ScopeEnum entityType) {
     if (ScopeEnum.PART.equals(entityType)) {
     if (ScopeEnum.PART.equals(entityType)) {
       if (deviceIds == null || deviceIds.isEmpty()) {
       if (deviceIds == null || deviceIds.isEmpty()) {
         throw new TkDataValidationException(ErrorMessage.DEVICE_LOSED.getMessage());
         throw new TkDataValidationException(ErrorMessage.DEVICE_LOSED.getMessage());
@@ -338,13 +353,13 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     String organizationId = (String) queryMap.get("organizationId");
     String organizationId = (String) queryMap.get("organizationId");
     // 不为空
     // 不为空
     if (null != organizationId && !StringUtils.isEmpty(organizationId)) {
     if (null != organizationId && !StringUtils.isEmpty(organizationId)) {
-      queryMap.put(
-          "organizationIds", getQueryOrganizationIds(tenantId, List.of(organizationId)));
+      queryMap.put("organizationIds", getQueryOrganizationIds(tenantId, List.of(organizationId)));
     }
     }
     if (!isCustomerUser) {
     if (!isCustomerUser) {
       queryMap.remove("currentUser");
       queryMap.remove("currentUser");
     }
     }
-    IPage<TkSceneLinkageEntity> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    IPage<TkSceneLinkageEntity> page =
+        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<SceneLinkageDTO> scenePage = baseMapper.getScenePage(page, queryMap);
     IPage<SceneLinkageDTO> scenePage = baseMapper.getScenePage(page, queryMap);
     return getPageData(scenePage, SceneLinkageDTO.class);
     return getPageData(scenePage, SceneLinkageDTO.class);
   }
   }
@@ -392,7 +407,8 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
    * @return 设备集合
    * @return 设备集合
    */
    */
   @Override
   @Override
-  public List<DeviceDTO> findDeviceList(String organizationId, String tenantId, String customerId,List<DeviceTypeEnum> typeFilter) {
+  public List<DeviceDTO> findDeviceList(
+      String organizationId, String tenantId, String customerId, List<DeviceTypeEnum> typeFilter) {
     List<String> organizationFilter = new ArrayList<>();
     List<String> organizationFilter = new ArrayList<>();
     organizationFilter.add(organizationId);
     organizationFilter.add(organizationId);
     // 查询该组织的所有子类
     // 查询该组织的所有子类
@@ -405,7 +421,6 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
     }
     }
 
 
-
     List<String> customerDevices = null;
     List<String> customerDevices = null;
     // 不等于默认的UUID就是客户用户
     // 不等于默认的UUID就是客户用户
     if (!EntityId.NULL_UUID.toString().equals(customerId)) {
     if (!EntityId.NULL_UUID.toString().equals(customerId)) {
@@ -416,18 +431,19 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     }
     }
 
 
     List<TkDeviceEntity> orgDevices =
     List<TkDeviceEntity> orgDevices =
-            deviceMapper.selectList(
-                    new QueryWrapper<TkDeviceEntity>().lambda().in(TkDeviceEntity::getOrganizationId, orgIds));
+        deviceMapper.selectList(
+            new QueryWrapper<TkDeviceEntity>()
+                .lambda()
+                .in(TkDeviceEntity::getOrganizationId, orgIds));
     List<DeviceDTO> result =
     List<DeviceDTO> result =
         orgDevices.stream()
         orgDevices.stream()
-                .filter(t -> typeFilter.isEmpty() || typeFilter.contains(t.getDeviceType()))
+            .filter(t -> typeFilter.isEmpty() || typeFilter.contains(t.getDeviceType()))
             .map(device -> device.getDTO(DeviceDTO.class))
             .map(device -> device.getDTO(DeviceDTO.class))
             .collect(Collectors.toList());
             .collect(Collectors.toList());
 
 
-
     if (null != customerDevices && customerDevices.size() > 0) {
     if (null != customerDevices && customerDevices.size() > 0) {
       List<DeviceDTO> customerAllDevice = new ArrayList<>();
       List<DeviceDTO> customerAllDevice = new ArrayList<>();
-      for(DeviceDTO item: result){
+      for (DeviceDTO item : result) {
         if (customerDevices.contains(item.getTbDeviceId())) {
         if (customerDevices.contains(item.getTbDeviceId())) {
           customerAllDevice.add(item);
           customerAllDevice.add(item);
         }
         }
@@ -480,12 +496,10 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
       return null;
       return null;
     }
     }
 
 
+    Map<String, List<RuleFilterDTO>> matchedDevices = new HashMap<>();
+    Map<String, List<RuleFilterDTO>> matchedProjectes = new HashMap<>();
 
 
-
-
-    Map<String, List<String>> matchedDevices = new HashMap<>();
-    Map<String, List<String>> matchedProjectes = new HashMap<>();
-
+    Set<String> projectFilter = new HashSet<>();
     List<TkTriggerEntity> triggers =
     List<TkTriggerEntity> triggers =
         triggerMapper.selectList(
         triggerMapper.selectList(
             new QueryWrapper<TkTriggerEntity>()
             new QueryWrapper<TkTriggerEntity>()
@@ -493,27 +507,51 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
                 .eq(TkTriggerEntity::getTenantId, tenantId)
                 .eq(TkTriggerEntity::getTenantId, tenantId)
                 .eq(TkTriggerEntity::getTriggerType, TriggerTypeEnum.DEVICE_TRIGGER)
                 .eq(TkTriggerEntity::getTriggerType, TriggerTypeEnum.DEVICE_TRIGGER)
                 .in(TkTriggerEntity::getSceneLinkageId, enableIds));
                 .in(TkTriggerEntity::getSceneLinkageId, enableIds));
-
     triggers.forEach(
     triggers.forEach(
         trigger -> {
         trigger -> {
-          String scenId = trigger.getSceneLinkageId();
-          if (ScopeEnum.ALL.equals(trigger.getEntityType()) ) {
-            List<String> triggerIds = new ArrayList<>();
-            triggerIds.add(trigger.getDeviceProfileId());
-            deviceSceneMap(matchedProjectes, triggerIds, scenId);
-          }else{
-            deviceSceneMap(matchedDevices, trigger.getEntityId(), scenId);
-          }
+          projectFilter.add(trigger.getDeviceProfileId());
+          deviceSceneMap(
+              matchedProjectes,
+              matchedDevices,
+              trigger.getId(),
+              trigger.getSceneLinkageId(),
+              trigger.getEntityType(),
+              trigger.getDeviceProfileId(),
+              trigger.getEntityId());
+        });
 
 
+    List<TkDoConditionEntity> conditions =
+        doConditionMapper.selectList(
+            new QueryWrapper<TkDoConditionEntity>()
+                .lambda()
+                .eq(TkDoConditionEntity::getTenantId, tenantId)
+                .eq(TkDoConditionEntity::getTriggerType, TriggerTypeEnum.DEVICE_TRIGGER)
+                .in(TkDoConditionEntity::getSceneLinkageId, enableIds));
+    conditions.forEach(
+        condition -> {
+          projectFilter.add(condition.getDeviceProfileId());
+          deviceSceneMap(
+              matchedProjectes,
+              matchedDevices,
+              condition.getId(),
+              condition.getSceneLinkageId(),
+              condition.getEntityType(),
+              condition.getDeviceProfileId(),
+              condition.getEntityId());
         });
         });
 
 
-    if (matchedDevices.isEmpty()&&matchedProjectes.isEmpty()) {
+    if (matchedDevices.isEmpty() && matchedProjectes.isEmpty()) {
       return null;
       return null;
     }
     }
 
 
-List<TkDeviceProfileEntity> profiles = profileMapper.selectList(new LambdaQueryWrapper<TkDeviceProfileEntity>().eq(TkDeviceProfileEntity::getTenantId,tenantId));
+
+
+    List<TkDeviceProfileEntity> profiles =
+        profileMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceProfileEntity>()
+                .eq(TkDeviceProfileEntity::getTenantId, tenantId).in(TkDeviceProfileEntity::getId, projectFilter));
     Map<String, String> projects = new HashMap<>();
     Map<String, String> projects = new HashMap<>();
-    profiles.forEach(f->projects.put(f.getTbProfileId(),f.getId()));
+    profiles.forEach(f -> projects.put(f.getTbProfileId(), f.getId()));
 
 
     Map<String, Map> engineConfig = new HashMap<>();
     Map<String, Map> engineConfig = new HashMap<>();
     engineConfig.put("scenes", matchedDevices);
     engineConfig.put("scenes", matchedDevices);
@@ -525,21 +563,38 @@ List<TkDeviceProfileEntity> profiles = profileMapper.selectList(new LambdaQueryW
     return JacksonUtil.convertValue(engineConfig, JsonNode.class);
     return JacksonUtil.convertValue(engineConfig, JsonNode.class);
   }
   }
 
 
-
+  private void deviceSceneMap(
+      Map<String, List<RuleFilterDTO>> matchedProjectes,
+      Map<String, List<RuleFilterDTO>> matchedDevices,String ruleId,
+      String scenId,
+      ScopeEnum scope,
+      String profileId,
+      List<String> deviceIds) {
+    if (ScopeEnum.ALL.equals(scope)) {
+      List<String> profileIds = new ArrayList<>();
+      profileIds.add(profileId);
+      deviceSceneMap(matchedProjectes, profileIds,ruleId, scenId);
+    } else {
+      deviceSceneMap(matchedDevices, deviceIds,ruleId, scenId);
+    }
+  }
 
 
   /**
   /**
    * 设备与场景联动的映射集合
    * 设备与场景联动的映射集合
    *
    *
    * @param resultMap 缓存设备和场景联动映射结果的集合
    * @param resultMap 缓存设备和场景联动映射结果的集合
-   * @param devices 设备主键集合
+   * @param postfixIds 设备或产品主键集合
    * @param scenId 场景联动主键
    * @param scenId 场景联动主键
    */
    */
   private void deviceSceneMap(
   private void deviceSceneMap(
-      Map<String, List<String>> resultMap, List<String> devices, String scenId) {
-    for (String deviceId : devices) {
-      List<String> scenes = resultMap.computeIfAbsent(deviceId, k -> new ArrayList<String>());
-      if (!scenes.contains(scenId)) {
-        scenes.add(scenId);
+      Map<String, List<RuleFilterDTO>> resultMap, List<String> postfixIds, String prefixId, String scenId) {
+    for (String deviceId : postfixIds) {
+      List<RuleFilterDTO> scenes = resultMap.computeIfAbsent(deviceId, k -> new ArrayList<RuleFilterDTO>());
+      RuleFilterDTO filter = new RuleFilterDTO();
+      filter.setRuleId(prefixId);
+      filter.setScenId(scenId);
+      if (!scenes.contains(filter)) {
+        scenes.add(filter);
       }
       }
       resultMap.put(deviceId, scenes);
       resultMap.put(deviceId, scenes);
     }
     }

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;

@@ -3,7 +3,7 @@ package org.thingsboard.server.dao.yunteng.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
 
 
 import java.util.List;
 import java.util.List;

@@ -3,7 +3,7 @@ package org.thingsboard.server.dao.yunteng.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.DoConditionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoConditionDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDoConditionEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDoConditionEntity;
 
 
 import java.util.List;
 import java.util.List;

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkSceneLinkageEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkSceneLinkageEntity;
 
 
 import java.util.Map;
 import java.util.Map;

@@ -3,7 +3,7 @@ package org.thingsboard.server.dao.yunteng.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 
 
 import java.util.List;
 import java.util.List;

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
-import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
 
 
 import java.util.List;
 import java.util.List;

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkSceneLinkageEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkSceneLinkageEntity;

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkTriggerEntity;
 
 
 import java.util.List;
 import java.util.List;

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoActionMapper">
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoActionMapper">
-    <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoActionDTO">
+    <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.scene.DoActionDTO">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="deviceId" column="device_id"
         <result property="deviceId" column="device_id"
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper">
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper">
-    <resultMap id="conditionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoConditionDTO">
+    <resultMap id="conditionDTO" type="org.thingsboard.server.common.data.yunteng.dto.scene.DoConditionDTO">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="entityId" column="entity_id"
         <result property="entityId" column="entity_id"
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.SceneLinkageMapper">
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.SceneLinkageMapper">
-    <resultMap id="sceneLinkageMap" type="org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO">
+    <resultMap id="sceneLinkageMap" type="org.thingsboard.server.common.data.yunteng.dto.scene.SceneLinkageDTO">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="name" column="name"/>
         <result property="organizationId" column="organization_id"/>
         <result property="organizationId" column="organization_id"/>

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper">
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper">
-    <resultMap id="triggerDTO" type="org.thingsboard.server.common.data.yunteng.dto.TriggerDTO">
+    <resultMap id="triggerDTO" type="org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="entityId" column="entity_id"
         <result property="entityId" column="entity_id"
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
                 typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>

@@ -44,8 +44,8 @@
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <groupId>org.thingsboard.common</groupId>
-            <artifactId>dao-api</artifactId>
+            <groupId>org.thingsboard</groupId>
+            <artifactId>dao</artifactId>
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>

@@ -56,6 +56,7 @@ import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 
 
 import java.util.Set;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BiConsumer;
@@ -285,4 +286,8 @@ public interface TbContext {
     void removeListeners();
     void removeListeners();
 
 
     TenantProfile getTenantProfile();
     TenantProfile getTenantProfile();
+
+
+    //Thingskit function
+    TkDeviceService getTkDeviceService();
 }
 }

@@ -16,12 +16,13 @@
 package org.thingsboard.rule.engine.rpc;
 package org.thingsboard.rule.engine.rpc;
 
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleEngineDeviceRpcRequest;
 import org.thingsboard.rule.engine.api.RuleEngineDeviceRpcRequest;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -31,9 +32,17 @@ import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.enums.CmdTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsg;
 
 
 import java.util.Random;
 import java.util.Random;
@@ -98,12 +107,41 @@ public class TbSendRPCRequestNode implements TbNode {
             String params = parseJsonData(json.get("params"));
             String params = parseJsonData(json.get("params"));
             String additionalInfo = parseJsonData(json.get(DataConstants.ADDITIONAL_INFO));
             String additionalInfo = parseJsonData(json.get(DataConstants.ADDITIONAL_INFO));
 
 
+
+            /** Thingskit function
+             *  1.1、目标设备为网关子设备时，表单数据增加属性deviceName。
+             *  1.2、目标设备为网关子设备时，附加信息增加属性target，便于命令下发记录挂靠。
+             *  1.3、目标设备为网关子设备时，将RuleEngineDeviceRpcRequest对象的deviceId改为网关设备。
+             *  2、附加信息增加属性cmdType，记录命令下发类型，例如：定时任务。
+             */
+            UUID orginatorId = msg.getOriginator().getId();
+            DeviceId targetId = new DeviceId(orginatorId);
+            DeviceDTO targetDevice = ctx.getTkDeviceService().findDeviceInfoByTbDeviceId(ctx.getTenantId().getId().toString(), orginatorId.toString());
+            DeviceId netEnableId = DeviceTypeEnum.SENSOR == targetDevice.getDeviceType()?new DeviceId(UUID.fromString(targetDevice.getGatewayId())):targetId;
+            if(DeviceTypeEnum.SENSOR == targetDevice.getDeviceType() && params.contains("}")){
+                ObjectNode methodParams = (ObjectNode) JacksonUtil.toJsonNode(params);
+                methodParams.put(FastIotConstants.Rpc.TARGET_NAME,targetDevice.getName());
+                params = JacksonUtil.toString(methodParams);
+            }
+            ObjectNode additional = JacksonUtil.newObjectNode();
+            if(StringUtils.isNotBlank(additionalInfo)){
+                additional = (ObjectNode) JacksonUtil.toJsonNode(additionalInfo);
+            }
+            if(!additional.has(FastIotConstants.Rpc.TARGET_ID)){
+                additional.put(FastIotConstants.Rpc.TARGET_ID, orginatorId.toString());
+            }
+            if(!additional.has(ModelConstants.TablePropertyMapping.COMMAND_TYPE)){
+                additional.put(ModelConstants.TablePropertyMapping.COMMAND_TYPE, CmdTypeEnum.DIY.ordinal());
+            }
+            additionalInfo = JacksonUtil.toString(additional);
+
+
             RuleEngineDeviceRpcRequest request = RuleEngineDeviceRpcRequest.builder()
             RuleEngineDeviceRpcRequest request = RuleEngineDeviceRpcRequest.builder()
                     .oneway(oneway)
                     .oneway(oneway)
                     .method(json.get("method").getAsString())
                     .method(json.get("method").getAsString())
                     .body(params)
                     .body(params)
                     .tenantId(ctx.getTenantId())
                     .tenantId(ctx.getTenantId())
-                    .deviceId(new DeviceId(msg.getOriginator().getId()))
+                    .deviceId(netEnableId)
                     .requestId(requestId)
                     .requestId(requestId)
                     .requestUUID(requestUUID)
                     .requestUUID(requestUUID)
                     .originServiceId(originServiceId)
                     .originServiceId(originServiceId)

@@ -3,12 +3,10 @@ package org.thingsboard.rule.engine.yunteng.scene;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicBoolean;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NotNull;
@@ -23,7 +21,7 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.ActionAlarmDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ActionAlarmDTO;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.scene.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.enums.*;
 import org.thingsboard.server.common.data.yunteng.enums.*;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
@@ -86,7 +84,16 @@ class ReactState {
     this.ytDeviceService = SpringBeanUtils.getBean(TkDeviceService.class);
     this.ytDeviceService = SpringBeanUtils.getBean(TkDeviceService.class);
   }
   }
 
 
-  public void process(TbContext ctx, TbMsg msg, String profileId, String deviceId)
+  /**
+   * 触发器内部逻辑：或 执行条件内部逻辑：且 触发器和执行条件之间的逻辑：且
+   *
+   * @param ctx
+   * @param msg 设备推送的遥测数据
+   * @param deviceId 遥测数据的来源设备的TB设备ID
+   * @throws ExecutionException
+   * @throws InterruptedException
+   */
+  public void process(TbContext ctx, TbMsg msg,  String prefixId,String deviceId)
       throws ExecutionException, InterruptedException {
       throws ExecutionException, InterruptedException {
 
 
     StringBuilder detail = new StringBuilder();
     StringBuilder detail = new StringBuilder();
@@ -94,74 +101,120 @@ class ReactState {
       ctx.tellSuccess(msg);
       ctx.tellSuccess(msg);
     }
     }
 
 
-    boolean matched = false;
-    if (triggers == null || triggers.isEmpty()) {
-      matched = true;
-    } else {
-      boolean itemMatched = false;
-      for (TriggerDTO trigger : triggers) {
-        TriggerState triggerState = getOrCreateTriggerState(trigger, profileId, deviceId);
-        if (triggerState == null) {
-          continue;
-        }
-        itemMatched = triggerState.process(ctx, msg);
-        if (itemMatched) {
-          matched = true;
-          detail.append(
-              triggerState.getAlarmDetails() == null ? "" : triggerState.getAlarmDetails());
-          if (this.alarmAction != null) {
-            noticeMsg(
-                ctx,
-                msg,
-                alarmAction,
-                deviceId,
-                triggerState.getAlarmDetails(),
-                triggerState.getLatestValues().getTs());
-          }
-        } else if (currentAlarms.containsKey(deviceId) && this.alarmAction != null) {
-          // 清除设备告警
-          for (AlarmConditionFilterKey entityKey : triggerState.getEntityKeys()) {
-            clearAlarm(ctx, msg, deviceId, entityKey.getKey());
-          }
-        }
-      }
-    }
+    AtomicBoolean triggerMatched = new AtomicBoolean(true);
+    Optional.ofNullable(triggers)
+        .ifPresent(
+            t -> {
+              triggerMatched.set(false);
+              t.forEach(
+                  trigger -> {
+                    ScopeEnum entityType = trigger.getEntityType();
+                    List<String> trifggerDevices = trigger.getEntityId();
+                    String tkProjectId = trigger.getDeviceProfileId();
+                    if (ScopeEnum.ALL.equals(entityType)) {
+                      trifggerDevices =
+                          ytDeviceService.findTbDeviceIdsByDeviceProfileId(
+                              tkProjectId, trigger.getTenantId());
+                    }
+                    triggerMatched.set(
+                        trifggerDevices.stream()
+                            .anyMatch(
+                                id -> {
+                                  TriggerState triggerState =
+                                      getOrCreateTriggerState(trigger, tkProjectId, id);
+                                  if (triggerState == null) {
+                                    return false;
+                                  }
+                                  try {
+                                    boolean fresh = false;
+                                    if(trigger.getId().equals(prefixId)&&msg.getOriginator().getId().toString().equals(id)){
+                                      fresh=true;
+                                    }
+                                    boolean result = triggerState.process(ctx, msg,fresh);
+                                    log.error(String.format("触发器【%s】刷新【%s】结果【%s】触发器设备【%s】数据设备【%s】数据内容【%s】",trigger.getId(),fresh,result,id,msg.getOriginator(),msg.getData()));
+                                    if (result) {
+                                      detail.append(
+                                          triggerState.getAlarmDetails() == null
+                                              ? ""
+                                              : triggerState.getAlarmDetails());
+                                      return true;
+                                    } else if (currentAlarms.containsKey(deviceId)) {
+                                      // 清除设备告警
+                                      for (AlarmConditionFilterKey entityKey :
+                                          triggerState.getEntityKeys()) {
+                                        clearAlarm(ctx, msg, deviceId, entityKey.getKey());
+                                      }
+                                    }
+                                  } catch (ExecutionException e) {
+                                    throw new RuntimeException(e);
+                                  } catch (InterruptedException e) {
+                                    throw new RuntimeException(e);
+                                  }
+                                  return false;
+                                }));
+                  });
+            });
 
 
-    if (matched && conditions.size() > 0) {
-      matched = false;
-      for (TkDoConditionEntity item : conditions) {
-        List<String> entityIds = item.getEntityId();
-        if (entityIds == null || entityIds.isEmpty()) {
-          matched = true;
-          break;
-        }
-        for (String id : entityIds) {
-          TriggerState conditionState = getOrCreateConditionState(item, profileId, id);
-          if (conditionState == null || conditionState.process(ctx, msg)) {
-            detail.append("；");
-            detail.append(conditionState.getAlarmDetails());
-            matched = true;
-            break;
-          }
-        }
-        if (matched) {
-          break;
-        }
-      }
-    }
+    /** 执行条件的所有设备都满足才为true */
+    AtomicBoolean conditionMatched = new AtomicBoolean(true);
+    Optional.ofNullable(conditions)
+            .ifPresent(
+                    t -> {
+                      t.forEach(
+                              condition -> {
+                                ScopeEnum entityType = condition.getEntityType();
+                                List<String> conditionDevices = condition.getEntityId();
+                                String tkProjectId = condition.getDeviceProfileId();
+                                if (ScopeEnum.ALL.equals(entityType)) {
+                                  conditionDevices =
+                                          ytDeviceService.findTbDeviceIdsByDeviceProfileId(
+                                                  tkProjectId, condition.getTenantId());
+                                }
+                                conditionMatched.set(
+                                        !conditionDevices.stream()
+                                                .anyMatch(
+                                                        id -> {
+                                                          TriggerState conditionState =
+                                                                  getOrCreateConditionState(condition, tkProjectId, id);
+                                                          try {
+                                                            boolean fresh = false;
+                                                            if(msg.getOriginator().getId().toString().equals(id)){
+                                                              fresh=true;
+                                                            }
+                                                            boolean result = conditionState.process(ctx, msg,fresh);
+                                                            log.warn(String.format("执行器【%s】刷新【%s】结果【%s】执行器设备【%s】数据设备【%s】数据内容【%s】",condition.getId(),fresh,result,id,msg.getOriginator(),msg.getData()));
+                                                            return !result;
+                                                          } catch (ExecutionException e) {
+                                                            throw new RuntimeException(e);
+                                                          } catch (InterruptedException e) {
+                                                            throw new RuntimeException(e);
+                                                          }
+                                                        }));
+                              });
+                    });
 
 
-    if (matched) {
+    if (triggerMatched.get() && conditionMatched.get()) {
+      log.error(String.format("设备【%s】的消息内容【%s】触发动作",deviceId,msg.getData()));
       for (TkDoActionEntity item : actions) {
       for (TkDoActionEntity item : actions) {
         if (ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())) {
         if (ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())) {
-          continue;
+          noticeMsg(ctx, msg, item, deviceId, detail.toString(), msg.getTs());
+        } else {
+          pushMsg(ctx, msg, item, detail.toString());
         }
         }
-        pushMsg(ctx, msg, item, detail.toString());
       }
       }
     } else {
     } else {
       ctx.tellSuccess(msg);
       ctx.tellSuccess(msg);
     }
     }
   }
   }
 
 
+  /**
+   * 获取触发器状态
+   *
+   * @param trigger 触发器数据
+   * @param profileId 遥测数据的来源设备的TK产品ID
+   * @param deviceId 遥测数据的来源设备的TB设备ID
+   * @return
+   */
   protected TriggerState getOrCreateTriggerState(
   protected TriggerState getOrCreateTriggerState(
       TriggerDTO trigger, String profileId, String deviceId) {
       TriggerDTO trigger, String profileId, String deviceId) {
     String triggerId = trigger.getId();
     String triggerId = trigger.getId();
@@ -173,6 +226,7 @@ class ReactState {
         || (trigger.getEntityType().equals(ScopeEnum.ALL)
         || (trigger.getEntityType().equals(ScopeEnum.ALL)
             && trigger.getDeviceProfileId().equals(profileId))) {
             && trigger.getDeviceProfileId().equals(profileId))) {
       TriggerState state = createTriggerState(deviceId, trigger.getTriggerCondition());
       TriggerState state = createTriggerState(deviceId, trigger.getTriggerCondition());
+      log.error(String.format("新建设备【%s】的触发器",deviceId));
       triggerState.put(cacheKey, state);
       triggerState.put(cacheKey, state);
       return state;
       return state;
     }
     }
@@ -224,7 +278,7 @@ class ReactState {
         || (condition.getEntityType().equals(ScopeEnum.ALL)
         || (condition.getEntityType().equals(ScopeEnum.ALL)
             && condition.getDeviceProfileId().equals(profileId))) {
             && condition.getDeviceProfileId().equals(profileId))) {
       TriggerState state = createTriggerState(deviceId, condition.getTriggerCondition());
       TriggerState state = createTriggerState(deviceId, condition.getTriggerCondition());
-      triggerState.put(cacheKey, state);
+      conditionState.put(cacheKey, state);
       return state;
       return state;
     }
     }
     return null;
     return null;
@@ -242,10 +296,6 @@ class ReactState {
   }
   }
 
 
   private void pushMsg(TbContext ctx, TbMsg msg, TkDoActionEntity action, String detail) {
   private void pushMsg(TbContext ctx, TbMsg msg, TkDoActionEntity action, String detail) {
-    TbMsgMetaData metaData = // lastMsgMetaData != null ? lastMsgMetaData.copy() :
-        new TbMsgMetaData();
-    String relationType = "";
-    TbMsg newMsg = null;
     switch (action.getOutTarget()) {
     switch (action.getOutTarget()) {
       case DEVICE_OUT:
       case DEVICE_OUT:
         List<String> rpcDevices = action.getDeviceId();
         List<String> rpcDevices = action.getDeviceId();
@@ -358,7 +408,7 @@ class ReactState {
   private void clearAlarm(TbContext ctx, TbMsg msg, String deviceId, String key)
   private void clearAlarm(TbContext ctx, TbMsg msg, String deviceId, String key)
       throws ExecutionException, InterruptedException {
       throws ExecutionException, InterruptedException {
     TriggerState clearState = getOrCreateClearState(deviceId, key);
     TriggerState clearState = getOrCreateClearState(deviceId, key);
-    if (clearState != null && clearState.process(ctx, msg)) {
+    if (clearState != null && clearState.process(ctx, msg,true)) {
       ctx.getAlarmService()
       ctx.getAlarmService()
           .clearAlarmForResult(
           .clearAlarmForResult(
               ctx.getTenantId(),
               ctx.getTenantId(),

 /**
 /**
  * Copyright © 2016-2022 The Thingsboard Authors
  * Copyright © 2016-2022 The Thingsboard Authors
  *
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
  *
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
 package org.thingsboard.rule.engine.yunteng.scene;
 package org.thingsboard.rule.engine.yunteng.scene;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.JsonParser;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.*;
 import org.thingsboard.rule.engine.api.*;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
@@ -24,129 +24,116 @@ import org.thingsboard.rule.engine.filter.TbCheckAlarmStatusNodeConfig;
 import org.thingsboard.rule.engine.profile.SnapshotUpdate;
 import org.thingsboard.rule.engine.profile.SnapshotUpdate;
 import org.thingsboard.rule.engine.yunteng.utils.TriggerRuleState;
 import org.thingsboard.rule.engine.yunteng.utils.TriggerRuleState;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionKeyType;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionKeyType;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.yunteng.dto.scene.RuleFilterDTO;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
-import org.thingsboard.server.common.msg.session.SessionMsgType;
-import org.thingsboard.server.common.transport.adaptor.JsonConverter;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
 
 
 @Slf4j
 @Slf4j
 @RuleNode(
 @RuleNode(
-        type = ComponentType.FILTER,
-        name = "scene react",
-        configClazz = TbCheckAlarmStatusNodeConfig.class,
-        relationTypes = {"Message","Alarm Created", "Alarm Updated",  "RPC Request"},
-        nodeDescription = "基于业务场景，实现设备的交互控制。",
-        nodeDetails = "基于业务场景，实现设备的交互控制。",
-        uiResources = {"static/rulenode/rulenode-core-config.js"},
-        configDirective = "tbSceneReactNodeConfig")
+    type = ComponentType.FILTER,
+    name = "scene react",
+    configClazz = TbCheckAlarmStatusNodeConfig.class,
+    relationTypes = {"Message", "Alarm Created", "Alarm Updated", "RPC Request"},
+    nodeDescription = "基于业务场景，实现设备的交互控制。",
+    nodeDetails = "基于业务场景，实现设备的交互控制。",
+    uiResources = {"static/rulenode/rulenode-core-config.js"},
+    configDirective = "tbSceneReactNodeConfig")
 public class TbSceneReactNode implements TbNode {
 public class TbSceneReactNode implements TbNode {
-    private final ObjectMapper mapper = new ObjectMapper();
-    private TbSceneReactNodeConfig config;
-
-
-
-
-    /**场景联动状态
-     * 键：场景联动主键
-     * 值：场景联动状态
-     * */
-    private final Map<String, ReactState> reactStates = new ConcurrentHashMap<>();
-
-
-
-    private TbContext ctx;
-
-    @Override
-    public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
-        this.config = TbNodeUtils.convert(configuration, TbSceneReactNodeConfig.class);
-        this.ctx = ctx;
+  private final ObjectMapper mapper = new ObjectMapper();
+  private TbSceneReactNodeConfig config;
+
+  /** 场景联动状态 键：场景联动主键 值：场景联动状态 */
+  private final Map<String, ReactState> reactStates = new ConcurrentHashMap<>();
+
+  private TbContext ctx;
+
+  @Override
+  public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
+    this.config = TbNodeUtils.convert(configuration, TbSceneReactNodeConfig.class);
+    this.ctx = ctx;
+  }
+
+  @Override
+  public void onMsg(TbContext ctx, TbMsg msg) {
+    String deviceId = msg.getOriginator().getId().toString();
+    String tbProfileId = msg.getMetaData().getValue("deviceProfileId");
+    String projectId = config.getProfile().get(tbProfileId);
+    boolean deviceHas = config.getScenes().containsKey(deviceId);
+    boolean profileHas = config.getProject().containsKey(projectId);
+    if (!deviceHas && !profileHas) {
+      ctx.tellSuccess(msg);
+      return;
     }
     }
-
-    @Override
-    public void onMsg(TbContext ctx, TbMsg msg)  {
-        String deviceId = msg.getOriginator().getId().toString();
-        String tbProfileId = msg.getMetaData().getValue("deviceProfileId");
-        String projectId = config.getProfile().get(tbProfileId);
-        boolean deviceHas = config.getScenes().containsKey(deviceId);
-        boolean profileHas = config.getProject().containsKey(projectId);
-        if(!deviceHas && !profileHas){
-            ctx.tellSuccess(msg);
-            return;
-        }
-        List<String> devScence = config.getScenes().get(deviceId);
-        if(devScence !=null && !devScence.isEmpty()){
-            devScence.stream().forEach(t ->{
-                ReactState react = getOrCreateReactState(ctx,config,t);
-                if(react != null){
-                    try {
-                        react.process(ctx, msg,projectId,deviceId);
-                    } catch (Exception e) {
-                        ctx.tellFailure(msg,e);
-                    }
-                }
-            });
-        }
-        List<String> projectScence = config.getProject().get(projectId);
-        if(projectScence !=null && !projectScence.isEmpty()){
-            projectScence.stream().forEach(t ->{
-                ReactState react = getOrCreateReactState(ctx,config,t);
-                if(react != null){
-                    try {
-                        react.process(ctx, msg,projectId,deviceId);
-                    } catch (Exception e) {
-                        ctx.tellFailure(msg,e);
-                    }
+    List<RuleFilterDTO> devScence = config.getScenes().get(deviceId);
+    if (devScence != null && !devScence.isEmpty()) {
+      devScence.stream()
+          .forEach(
+              t -> {
+                ReactState react = getOrCreateReactState(ctx, config, t.getScenId());
+                if (react != null) {
+                  try {
+                    react.process(ctx, msg,t.getRuleId(), deviceId);
+                  } catch (Exception e) {
+                    ctx.tellFailure(msg, e);
+                  }
                 }
                 }
-            });
-        }
-    }
-
-    /**
-     * 设备数据是否包含触发器的指标
-     * @param update    最新数据
-     * @param condition 触发条件工具类
-     * @return
-     */
-    public boolean validateUpdate(SnapshotUpdate update, TriggerRuleState condition) {
-        if (update != null) {
-            //Check that the update type and that keys match.
-            if (update.getType().equals(AlarmConditionKeyType.TIME_SERIES)) {
-                return condition.validateTsUpdate(update.getKeys());
-            } else if (update.getType().equals(AlarmConditionKeyType.ATTRIBUTE)) {
-                return condition.validateAttrUpdate(update.getKeys());
-            }
-        }
-        return true;
+              });
     }
     }
-    @Override
-    public void destroy() {
-        reactStates.clear();
+    List<RuleFilterDTO> projectScence = config.getProject().get(projectId);
+    if (projectScence != null && !projectScence.isEmpty()) {
+      projectScence.stream()
+          .forEach(
+              t -> {
+                ReactState react = getOrCreateReactState(ctx, config, t.getScenId());
+                if (react != null) {
+                  try {
+                    react.process(ctx, msg,t.getRuleId(), deviceId);
+                  } catch (Exception e) {
+                    ctx.tellFailure(msg, e);
+                  }
+                }
+              });
     }
     }
-
-    @Override
-    public void onPartitionChangeMsg(TbContext ctx, PartitionChangeMsg msg) {
-        // Cleanup the cache for all entities that are no longer assigned to current server partitions
-        reactStates.clear();
+  }
+
+  /**
+   * 设备数据是否包含触发器的指标
+   *
+   * @param update 最新数据
+   * @param condition 触发条件工具类
+   * @return
+   */
+  public boolean validateUpdate(SnapshotUpdate update, TriggerRuleState condition) {
+    if (update != null) {
+      // Check that the update type and that keys match.
+      if (update.getType().equals(AlarmConditionKeyType.TIME_SERIES)) {
+        return condition.validateTsUpdate(update.getKeys());
+      } else if (update.getType().equals(AlarmConditionKeyType.ATTRIBUTE)) {
+        return condition.validateAttrUpdate(update.getKeys());
+      }
     }
     }
-
-    protected ReactState getOrCreateReactState(TbContext ctx, TbSceneReactNodeConfig config, String sceneId) {
-        ReactState reactState = reactStates.get(sceneId);
-        if (reactState == null) {
-            reactState = new ReactState(sceneId,ctx, config);
-            reactStates.put(sceneId, reactState);
-        }
-        return reactState;
+    return true;
+  }
+
+  @Override
+  public void destroy() {
+    reactStates.clear();
+  }
+
+  @Override
+  public void onPartitionChangeMsg(TbContext ctx, PartitionChangeMsg msg) {
+    // Cleanup the cache for all entities that are no longer assigned to current server partitions
+    reactStates.clear();
+  }
+
+  protected ReactState getOrCreateReactState(
+      TbContext ctx, TbSceneReactNodeConfig config, String sceneId) {
+    ReactState reactState = reactStates.get(sceneId);
+    if (reactState == null) {
+      reactState = new ReactState(sceneId, ctx, config);
+      reactStates.put(sceneId, reactState);
     }
     }
-
-
+    return reactState;
+  }
 }
 }

-/**
- * 场景联动配置文件
- */
+/** 场景联动配置文件 */
 package org.thingsboard.rule.engine.yunteng.scene;
 package org.thingsboard.rule.engine.yunteng.scene;
 
 
-import lombok.Data;
-import org.thingsboard.rule.engine.api.NodeConfiguration;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.TenantId;
-
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import lombok.Data;
+import org.thingsboard.rule.engine.api.NodeConfiguration;
+import org.thingsboard.server.common.data.yunteng.dto.scene.RuleFilterDTO;
 
 
 @Data
 @Data
 public class TbSceneReactNodeConfig implements NodeConfiguration<TbSceneReactNodeConfig> {
 public class TbSceneReactNodeConfig implements NodeConfiguration<TbSceneReactNodeConfig> {
 
 
-    /**【设备ID,场景】设备的哪些指标会触发场景联动*/
-    private Map<String, List<String>> scenes;
-    /**【产品ID,场景】设备的哪些指标会触发场景联动*/
-    private Map<String, List<String>> project;
-    /**【场景ID,场景名称】场景联动信息*/
-    private Map<String, String> names;
-    /**【场景ID,组织ID】场景联动所属组织信息*/
-    private Map<String, String> orgs;
-    private Map<String, String> profile;
-
-
-
-
-
-    @Override
-    public TbSceneReactNodeConfig defaultConfiguration() {
-        TbSceneReactNodeConfig config = new TbSceneReactNodeConfig();
-        Map<String, List<String>> sceneMap = new HashMap<>();
-        Map<String, List<String>> projectScenes = new HashMap<>();
-
-        config.setScenes(sceneMap);
-        config.setProject(projectScenes);
-        config.setNames(new HashMap<>());
-        config.setOrgs(new HashMap<>());
-        config.setProfile(new HashMap<>());
-        return config;
-    }
+  /** 【TB设备配置ID,TK产品ID】产品信息 */
+  private Map<String, String> profile;
+  /** 【TK产品ID,场景】哪些产品会触发场景联动 */
+  private Map<String, List<RuleFilterDTO>> project;
+  /** 【TB设备ID,场景】哪些设备会触发场景联动 */
+  private Map<String, List<RuleFilterDTO>> scenes;
+  /** 【TK场景ID,场景名称】场景联动信息 */
+  private Map<String, String> names;
+  /** 【TK场景ID,组织ID】场景联动所属组织信息 */
+  private Map<String, String> orgs;
+
+  @Override
+  public TbSceneReactNodeConfig defaultConfiguration() {
+    TbSceneReactNodeConfig config = new TbSceneReactNodeConfig();
+    Map<String, List<RuleFilterDTO>> sceneMap = new HashMap<>();
+    Map<String, List<RuleFilterDTO>> projectScenes = new HashMap<>();
+
+    config.setScenes(sceneMap);
+    config.setProject(projectScenes);
+    config.setNames(new HashMap<>());
+    config.setOrgs(new HashMap<>());
+    config.setProfile(new HashMap<>());
+    return config;
+  }
 }
 }

 /**
 /**
  * Copyright © 2016-2022 The Thingsboard Authors
  * Copyright © 2016-2022 The Thingsboard Authors
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ *
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
 package org.thingsboard.rule.engine.yunteng.scene;
 package org.thingsboard.rule.engine.yunteng.scene;
 
 
 import com.google.gson.JsonParser;
 import com.google.gson.JsonParser;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.function.BiFunction;
 import lombok.Data;
 import lombok.Data;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.profile.*;
 import org.thingsboard.rule.engine.profile.*;
@@ -36,243 +38,312 @@ import org.thingsboard.server.common.msg.session.SessionMsgType;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.dao.sql.query.EntityKeyMapping;
 import org.thingsboard.server.dao.sql.query.EntityKeyMapping;
 
 
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.function.BiFunction;
-
 @Data
 @Data
 @Slf4j
 @Slf4j
 class TriggerState {
 class TriggerState {
-    private final String originator;
-    private volatile TriggerRuleState ruleState;
-    private volatile Alarm currentAlarm;
-    private volatile boolean initialFetchDone;
-    private volatile TbMsgMetaData lastMsgMetaData;
-
-    private final DynamicPredicateValueCtx dynamicPredicateValueCtx;
-    private DataSnapshot latestValues;
-
-    private final Set<AlarmConditionFilterKey> entityKeys;
-    private final String alarmDetails;
-
-    TriggerState(String originator, AlarmRule rule, Set<AlarmConditionFilterKey> filterKeys, String alarmDetails, DynamicPredicateValueCtx dynamicPredicateValueCtx) {
-
-        this.originator = originator;
-        this.dynamicPredicateValueCtx = dynamicPredicateValueCtx;
-        ruleState = new TriggerRuleState(rule.getCondition(), filterKeys, new PersistedAlarmRuleState(), rule.getSchedule());
-        this.entityKeys = filterKeys;
-        this.alarmDetails = alarmDetails;
+  private final String originator;
+  private volatile TriggerRuleState ruleState;
+  private volatile Alarm currentAlarm;
+  private volatile boolean initialFetchDone;
+  private volatile TbMsgMetaData lastMsgMetaData;
+
+  private final DynamicPredicateValueCtx dynamicPredicateValueCtx;
+  private DataSnapshot latestValues;
+
+  private final Set<AlarmConditionFilterKey> entityKeys;
+  private final String alarmDetails;
+
+  @Getter
+  /** 触发条件执行结果 */
+  private boolean ruleMatched = false;
+
+  TriggerState(
+      String originator,
+      AlarmRule rule,
+      Set<AlarmConditionFilterKey> filterKeys,
+      String alarmDetails,
+      DynamicPredicateValueCtx dynamicPredicateValueCtx) {
+
+    this.originator = originator;
+    this.dynamicPredicateValueCtx = dynamicPredicateValueCtx;
+    ruleState =
+        new TriggerRuleState(
+            rule.getCondition(), filterKeys, new PersistedAlarmRuleState(), rule.getSchedule());
+    this.entityKeys = filterKeys;
+    this.alarmDetails = alarmDetails;
+  }
+
+  public boolean process(TbContext ctx, TbMsg msg,boolean needFresh) throws ExecutionException, InterruptedException {
+    if (!needFresh) {
+      return ruleMatched;
     }
     }
-
-
-    public boolean process(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException {
-        if (latestValues == null) {
-            latestValues = fetchLatestValues(ctx, originator);
-        }
-        lastMsgMetaData = msg.getMetaData();
-        SnapshotUpdate update = null;
-        if (msg.getType().equals(SessionMsgType.POST_TELEMETRY_REQUEST.name())) {
-            update = processTelemetry(ctx, msg);
-        } else {
-            update = processAttributes(ctx, msg);
-        }
-
-        if (update != null && update.hasUpdate()) {
-            return createOrClearAlarms(ctx, msg, latestValues, update, TriggerRuleState::eval);
-        }
-        return false;
+    if (latestValues == null) {
+      latestValues = fetchLatestValues(ctx, originator);
     }
     }
-
-
-    public boolean process(TbContext ctx, long ts) throws ExecutionException, InterruptedException {
-        return createOrClearAlarms(ctx, null, ts, null, (alarmState, tsParam) -> alarmState.eval(tsParam, latestValues));
+    lastMsgMetaData = msg.getMetaData();
+    SnapshotUpdate update;
+    if (msg.getType().equals(SessionMsgType.POST_TELEMETRY_REQUEST.name())) {
+      update = processTelemetry(ctx, msg);
+    } else {
+      update = processAttributes(ctx, msg);
     }
     }
 
 
-    public <T> boolean createOrClearAlarms(TbContext ctx, TbMsg msg, T data, SnapshotUpdate update, BiFunction<TriggerRuleState, T, AlarmEvalResult> evalFunction) {
-        boolean stateUpdate = false;
-        if (!validateUpdate(update, ruleState)) {
-            return false;
-        }
-        AlarmEvalResult evalResult = evalFunction.apply(ruleState, data);
-        if (AlarmEvalResult.TRUE.equals(evalResult)) {
-            stateUpdate = true;
-            clearAlarmState(stateUpdate, ruleState);
-        } else if (AlarmEvalResult.FALSE.equals(evalResult)) {
-            clearAlarmState(stateUpdate, ruleState);
-        }
-        return stateUpdate;
+    if (update != null && update.hasUpdate()) {
+      ruleMatched = createOrClearAlarms(ctx, msg, latestValues, update, TriggerRuleState::eval);
+      return ruleMatched;
     }
     }
-
-
-    public boolean clearAlarmState(boolean stateUpdate, TriggerRuleState state) {
-        if (state != null) {
-            state.clear();
-            stateUpdate |= state.checkUpdate();
-        }
-        return stateUpdate;
+    return false;
+  }
+
+  public boolean process(TbContext ctx, long ts) throws ExecutionException, InterruptedException {
+    return createOrClearAlarms(
+        ctx, null, ts, null, (alarmState, tsParam) -> alarmState.eval(tsParam, latestValues));
+  }
+
+  public <T> boolean createOrClearAlarms(
+      TbContext ctx,
+      TbMsg msg,
+      T data,
+      SnapshotUpdate update,
+      BiFunction<TriggerRuleState, T, AlarmEvalResult> evalFunction) {
+    boolean stateUpdate = false;
+    if (!validateUpdate(update, ruleState)) {
+      return false;
     }
     }
-
-    public boolean validateUpdate(SnapshotUpdate update, TriggerRuleState state) {
-        if (update != null) {
-            //Check that the update type and that keys match.
-            if (update.getType().equals(AlarmConditionKeyType.TIME_SERIES)) {
-                return state.validateTsUpdate(update.getKeys());
-            } else if (update.getType().equals(AlarmConditionKeyType.ATTRIBUTE)) {
-                return state.validateAttrUpdate(update.getKeys());
-            }
-        }
-        return true;
+    AlarmEvalResult evalResult = evalFunction.apply(ruleState, data);
+    if (AlarmEvalResult.TRUE.equals(evalResult)) {
+      stateUpdate = true;
+      clearAlarmState(stateUpdate, ruleState);
+    } else if (AlarmEvalResult.FALSE.equals(evalResult)) {
+      clearAlarmState(stateUpdate, ruleState);
     }
     }
+    return stateUpdate;
+  }
 
 
-
-    protected void setAlarmConditionMetadata(TriggerRuleState ruleState, TbMsgMetaData metaData) {
-        if (ruleState.getSpec().getType() == AlarmConditionSpecType.REPEATING) {
-            metaData.putValue(DataConstants.ALARM_CONDITION_REPEATS, String.valueOf(ruleState.getState().getEventCount()));
-        }
-        if (ruleState.getSpec().getType() == AlarmConditionSpecType.DURATION) {
-            metaData.putValue(DataConstants.ALARM_CONDITION_DURATION, String.valueOf(ruleState.getState().getDuration()));
-        }
+  public boolean clearAlarmState(boolean stateUpdate, TriggerRuleState state) {
+    if (state != null) {
+      state.clear();
+      stateUpdate |= state.checkUpdate();
     }
     }
-
-
-    public void processAckAlarm(Alarm alarm) {
-        if (currentAlarm != null && currentAlarm.getId().equals(alarm.getId())) {
-            currentAlarm.setStatus(alarm.getStatus());
-            currentAlarm.setAckTs(alarm.getAckTs());
-        }
+    return stateUpdate;
+  }
+
+  public boolean validateUpdate(SnapshotUpdate update, TriggerRuleState state) {
+    if (update != null) {
+      // Check that the update type and that keys match.
+      if (update.getType().equals(AlarmConditionKeyType.TIME_SERIES)) {
+        return state.validateTsUpdate(update.getKeys());
+      } else if (update.getType().equals(AlarmConditionKeyType.ATTRIBUTE)) {
+        return state.validateAttrUpdate(update.getKeys());
+      }
     }
     }
-
-
-    protected SnapshotUpdate processAttributes(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException {
-        Set<AttributeKvEntry> attributes = JsonConverter.convertToAttributes(new JsonParser().parse(msg.getData()));
-        if (!attributes.isEmpty()) {
-            return merge(attributes);
-        }
-        return null;
+    return true;
+  }
+
+  protected void setAlarmConditionMetadata(TriggerRuleState ruleState, TbMsgMetaData metaData) {
+    if (ruleState.getSpec().getType() == AlarmConditionSpecType.REPEATING) {
+      metaData.putValue(
+          DataConstants.ALARM_CONDITION_REPEATS,
+          String.valueOf(ruleState.getState().getEventCount()));
     }
     }
-
-    protected SnapshotUpdate processTelemetry(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException {
-        Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToSortedTelemetry(new JsonParser().parse(msg.getData()), msg.getMetaDataTs());
-        for (Map.Entry<Long, List<KvEntry>> entry : tsKvMap.entrySet()) {
-            Long ts = entry.getKey();
-            List<KvEntry> data = entry.getValue();
-            return merge(ts, data);
-        }
-
-        return null;
+    if (ruleState.getSpec().getType() == AlarmConditionSpecType.DURATION) {
+      metaData.putValue(
+          DataConstants.ALARM_CONDITION_DURATION,
+          String.valueOf(ruleState.getState().getDuration()));
     }
     }
+  }
 
 
-
-    private DataSnapshot fetchLatestValues(TbContext ctx, String originator) throws ExecutionException, InterruptedException {
-        DataSnapshot result = new DataSnapshot(entityKeys);
-        addEntityKeysToSnapshot(ctx, originator, result);
-        return result;
+  public void processAckAlarm(Alarm alarm) {
+    if (currentAlarm != null && currentAlarm.getId().equals(alarm.getId())) {
+      currentAlarm.setStatus(alarm.getStatus());
+      currentAlarm.setAckTs(alarm.getAckTs());
     }
     }
-
-    private void addEntityKeysToSnapshot(TbContext ctx, String originator, DataSnapshot result) throws InterruptedException, ExecutionException {
-        Set<String> attributeKeys = new HashSet<>();
-        Set<String> latestTsKeys = new HashSet<>();
-
-        Device device = null;
-        for (AlarmConditionFilterKey entityKey : entityKeys) {
-            String key = entityKey.getKey();
-            switch (entityKey.getType()) {
-                case ATTRIBUTE:
-                    attributeKeys.add(key);
-                    break;
-                case TIME_SERIES:
-                    latestTsKeys.add(key);
-                    break;
-                case ENTITY_FIELD:
-                    if (device == null) {
-                        device = ctx.getDeviceService().findDeviceById(ctx.getTenantId(), new DeviceId(UUID.fromString(originator)));
-                    }
-                    if (device != null) {
-                        switch (key) {
-                            case EntityKeyMapping.NAME:
-                                result.putValue(entityKey, device.getCreatedTime(), EntityKeyValue.fromString(device.getName()));
-                                break;
-                            case EntityKeyMapping.TYPE:
-                                result.putValue(entityKey, device.getCreatedTime(), EntityKeyValue.fromString(device.getType()));
-                                break;
-                            case EntityKeyMapping.CREATED_TIME:
-                                result.putValue(entityKey, device.getCreatedTime(), EntityKeyValue.fromLong(device.getCreatedTime()));
-                                break;
-                            case EntityKeyMapping.LABEL:
-                                result.putValue(entityKey, device.getCreatedTime(), EntityKeyValue.fromString(device.getLabel()));
-                                break;
-                        }
-                    }
-                    break;
-            }
-        }
-
-        if (!latestTsKeys.isEmpty()) {
-            List<TsKvEntry> data = ctx.getTimeseriesService().findLatest(ctx.getTenantId(), new DeviceId(UUID.fromString(originator)), latestTsKeys).get();
-            for (TsKvEntry entry : data) {
-                if (entry.getValue() != null) {
-                    result.putValue(new AlarmConditionFilterKey(AlarmConditionKeyType.TIME_SERIES, entry.getKey()), entry.getTs(), toEntityValue(entry));
-                }
-            }
-        }
-        if (!attributeKeys.isEmpty()) {
-            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), new DeviceId(UUID.fromString(originator)), DataConstants.CLIENT_SCOPE, attributeKeys).get());
-            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), new DeviceId(UUID.fromString(originator)), DataConstants.SHARED_SCOPE, attributeKeys).get());
-            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), new DeviceId(UUID.fromString(originator)), DataConstants.SERVER_SCOPE, attributeKeys).get());
-        }
+  }
+
+  protected SnapshotUpdate processAttributes(TbContext ctx, TbMsg msg)
+      throws ExecutionException, InterruptedException {
+    Set<AttributeKvEntry> attributes =
+        JsonConverter.convertToAttributes(new JsonParser().parse(msg.getData()));
+    if (!attributes.isEmpty()) {
+      return merge(attributes);
+    }
+    return null;
+  }
+
+  protected SnapshotUpdate processTelemetry(TbContext ctx, TbMsg msg)
+      throws ExecutionException, InterruptedException {
+    Map<Long, List<KvEntry>> tsKvMap =
+        JsonConverter.convertToSortedTelemetry(
+            new JsonParser().parse(msg.getData()), msg.getMetaDataTs());
+    for (Map.Entry<Long, List<KvEntry>> entry : tsKvMap.entrySet()) {
+      Long ts = entry.getKey();
+      List<KvEntry> data = entry.getValue();
+      return merge(ts, data);
     }
     }
 
 
-    private void addToSnapshot(DataSnapshot snapshot, List<AttributeKvEntry> data) {
-        for (AttributeKvEntry entry : data) {
-            if (entry.getValue() != null) {
-                EntityKeyValue value = toEntityValue(entry);
-                snapshot.putValue(new AlarmConditionFilterKey(AlarmConditionKeyType.ATTRIBUTE, entry.getKey()), entry.getLastUpdateTs(), value);
+    return null;
+  }
+
+  private DataSnapshot fetchLatestValues(TbContext ctx, String originator)
+      throws ExecutionException, InterruptedException {
+    DataSnapshot result = new DataSnapshot(entityKeys);
+    addEntityKeysToSnapshot(ctx, originator, result);
+    return result;
+  }
+
+  private void addEntityKeysToSnapshot(TbContext ctx, String originator, DataSnapshot result)
+      throws InterruptedException, ExecutionException {
+    Set<String> attributeKeys = new HashSet<>();
+    Set<String> latestTsKeys = new HashSet<>();
+
+    Device device = null;
+    for (AlarmConditionFilterKey entityKey : entityKeys) {
+      String key = entityKey.getKey();
+      switch (entityKey.getType()) {
+        case ATTRIBUTE:
+          attributeKeys.add(key);
+          break;
+        case TIME_SERIES:
+          latestTsKeys.add(key);
+          break;
+        case ENTITY_FIELD:
+          if (device == null) {
+            device =
+                ctx.getDeviceService()
+                    .findDeviceById(ctx.getTenantId(), new DeviceId(UUID.fromString(originator)));
+          }
+          if (device != null) {
+            switch (key) {
+              case EntityKeyMapping.NAME:
+                result.putValue(
+                    entityKey,
+                    device.getCreatedTime(),
+                    EntityKeyValue.fromString(device.getName()));
+                break;
+              case EntityKeyMapping.TYPE:
+                result.putValue(
+                    entityKey,
+                    device.getCreatedTime(),
+                    EntityKeyValue.fromString(device.getType()));
+                break;
+              case EntityKeyMapping.CREATED_TIME:
+                result.putValue(
+                    entityKey,
+                    device.getCreatedTime(),
+                    EntityKeyValue.fromLong(device.getCreatedTime()));
+                break;
+              case EntityKeyMapping.LABEL:
+                result.putValue(
+                    entityKey,
+                    device.getCreatedTime(),
+                    EntityKeyValue.fromString(device.getLabel()));
+                break;
             }
             }
-        }
+          }
+          break;
+      }
     }
     }
 
 
-    public static EntityKeyValue toEntityValue(KvEntry entry) {
-        switch (entry.getDataType()) {
-            case STRING:
-                return EntityKeyValue.fromString(entry.getStrValue().get());
-            case LONG:
-                return EntityKeyValue.fromLong(entry.getLongValue().get());
-            case DOUBLE:
-                return EntityKeyValue.fromDouble(entry.getDoubleValue().get());
-            case BOOLEAN:
-                return EntityKeyValue.fromBool(entry.getBooleanValue().get());
-            case JSON:
-                return EntityKeyValue.fromJson(entry.getJsonValue().get());
-            default:
-                throw new RuntimeException("Can't parse entry: " + entry.getDataType());
+    if (!latestTsKeys.isEmpty()) {
+      List<TsKvEntry> data =
+          ctx.getTimeseriesService()
+              .findLatest(
+                  ctx.getTenantId(), new DeviceId(UUID.fromString(originator)), latestTsKeys)
+              .get();
+      for (TsKvEntry entry : data) {
+        if (entry.getValue() != null) {
+          result.putValue(
+              new AlarmConditionFilterKey(AlarmConditionKeyType.TIME_SERIES, entry.getKey()),
+              entry.getTs(),
+              toEntityValue(entry));
         }
         }
+      }
     }
     }
-
-    private SnapshotUpdate merge(Long newTs, List<KvEntry> data) {
-        Set<AlarmConditionFilterKey> keys = new HashSet<>();
-        for (KvEntry entry : data) {
-            AlarmConditionFilterKey entityKey = new AlarmConditionFilterKey(AlarmConditionKeyType.TIME_SERIES, entry.getKey());
-            if (latestValues.putValue(entityKey, newTs, toEntityValue(entry))) {
-                keys.add(entityKey);
-            }
-        }
-        latestValues.setTs(newTs);
-        return new SnapshotUpdate(AlarmConditionKeyType.TIME_SERIES, keys);
+    if (!attributeKeys.isEmpty()) {
+      addToSnapshot(
+          result,
+          ctx.getAttributesService()
+              .find(
+                  ctx.getTenantId(),
+                  new DeviceId(UUID.fromString(originator)),
+                  DataConstants.CLIENT_SCOPE,
+                  attributeKeys)
+              .get());
+      addToSnapshot(
+          result,
+          ctx.getAttributesService()
+              .find(
+                  ctx.getTenantId(),
+                  new DeviceId(UUID.fromString(originator)),
+                  DataConstants.SHARED_SCOPE,
+                  attributeKeys)
+              .get());
+      addToSnapshot(
+          result,
+          ctx.getAttributesService()
+              .find(
+                  ctx.getTenantId(),
+                  new DeviceId(UUID.fromString(originator)),
+                  DataConstants.SERVER_SCOPE,
+                  attributeKeys)
+              .get());
     }
     }
-
-    private SnapshotUpdate merge(Set<AttributeKvEntry> attributes) {
-        long newTs = 0;
-        Set<AlarmConditionFilterKey> keys = new HashSet<>();
-        for (AttributeKvEntry entry : attributes) {
-            newTs = Math.max(newTs, entry.getLastUpdateTs());
-            AlarmConditionFilterKey entityKey = new AlarmConditionFilterKey(AlarmConditionKeyType.ATTRIBUTE, entry.getKey());
-            if (latestValues.putValue(entityKey, newTs, toEntityValue(entry))) {
-                keys.add(entityKey);
-            }
-        }
-        latestValues.setTs(newTs);
-        return new SnapshotUpdate(AlarmConditionKeyType.ATTRIBUTE, keys);
+  }
+
+  private void addToSnapshot(DataSnapshot snapshot, List<AttributeKvEntry> data) {
+    for (AttributeKvEntry entry : data) {
+      if (entry.getValue() != null) {
+        EntityKeyValue value = toEntityValue(entry);
+        snapshot.putValue(
+            new AlarmConditionFilterKey(AlarmConditionKeyType.ATTRIBUTE, entry.getKey()),
+            entry.getLastUpdateTs(),
+            value);
+      }
     }
     }
-
-
+  }
+
+  public static EntityKeyValue toEntityValue(KvEntry entry) {
+    switch (entry.getDataType()) {
+      case STRING:
+        return EntityKeyValue.fromString(entry.getStrValue().get());
+      case LONG:
+        return EntityKeyValue.fromLong(entry.getLongValue().get());
+      case DOUBLE:
+        return EntityKeyValue.fromDouble(entry.getDoubleValue().get());
+      case BOOLEAN:
+        return EntityKeyValue.fromBool(entry.getBooleanValue().get());
+      case JSON:
+        return EntityKeyValue.fromJson(entry.getJsonValue().get());
+      default:
+        throw new RuntimeException("Can't parse entry: " + entry.getDataType());
+    }
+  }
+
+  private SnapshotUpdate merge(Long newTs, List<KvEntry> data) {
+    Set<AlarmConditionFilterKey> keys = new HashSet<>();
+    for (KvEntry entry : data) {
+      AlarmConditionFilterKey entityKey =
+          new AlarmConditionFilterKey(AlarmConditionKeyType.TIME_SERIES, entry.getKey());
+      if (latestValues.putValue(entityKey, newTs, toEntityValue(entry))) {
+        keys.add(entityKey);
+      }
+    }
+    latestValues.setTs(newTs);
+    return new SnapshotUpdate(AlarmConditionKeyType.TIME_SERIES, keys);
+  }
+
+  private SnapshotUpdate merge(Set<AttributeKvEntry> attributes) {
+    long newTs = 0;
+    Set<AlarmConditionFilterKey> keys = new HashSet<>();
+    for (AttributeKvEntry entry : attributes) {
+      newTs = Math.max(newTs, entry.getLastUpdateTs());
+      AlarmConditionFilterKey entityKey =
+          new AlarmConditionFilterKey(AlarmConditionKeyType.ATTRIBUTE, entry.getKey());
+      if (latestValues.putValue(entityKey, newTs, toEntityValue(entry))) {
+        keys.add(entityKey);
+      }
+    }
+    latestValues.setTs(newTs);
+    return new SnapshotUpdate(AlarmConditionKeyType.ATTRIBUTE, keys);
+  }
 }
 }