Merge pull request #301 from thingsboard/feature/rpc-rule

RPC call expiration time fix

extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/ServerSideRpcCallAction.java

@@ -76,6 +76,7 @@ public class ServerSideRpcCallAction extends SimpleRuleLifecycleComponent implem
             toDeviceRelationTemplate.ifPresent(t -> builder.toDeviceRelation(VelocityUtils.merge(t, context)));
             rpcCallMethodTemplate.ifPresent(t -> builder.rpcCallMethod(VelocityUtils.merge(t, context)));
             rpcCallBodyTemplate.ifPresent(t -> builder.rpcCallBody(VelocityUtils.merge(t, context)));
+            builder.rpcCallTimeoutInSec(configuration.getRpcCallTimeoutInSec());
             return Optional.of(new ServerSideRpcCallRuleToPluginActionMsg(toDeviceActorMsg.getTenantId(), toDeviceActorMsg.getCustomerId(), toDeviceActorMsg.getDeviceId(),
                     builder.build()));
         } else {

extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRuleMsgHandler.java

@@ -70,7 +70,7 @@ public class RpcRuleMsgHandler implements RuleMsgHandler {
                         deviceIds = relations.stream().map(EntityRelation::getFrom).collect(Collectors.toList());
                     }
                     ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(msg.getRpcCallMethod(), msg.getRpcCallBody());
-                    long expirationTime = System.currentTimeMillis() + msg.getRpcCallTimeoutInSec();
+                    long expirationTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(msg.getRpcCallTimeoutInSec());
                     for (EntityId address : deviceIds) {
                         DeviceId tmpId = new DeviceId(address.getId());
                         ctx.checkAccess(tmpId, new PluginCallback<Void>() {