fix(DEFECT-1234): 给网关子设备下发RPC指令

1、给子设备下发RPC指令时，自动转向网关 2、RPC记录挂载到网关子设备

fix(DEFECT-1234): 给网关子设备下发RPC指令
1、给子设备下发RPC指令时，自动转向网关 2、RPC记录挂载到网关子设备
芯火源
1 parent 6688e6c4
Showing 3 changed files with 45 additions and 10 deletions
application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/constant/FastIotConstants.java
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View file @e04221b
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View file @e04221b
@@ -58,6 +58,7 @@ import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 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.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.CmdTypeEnum;
 import org.thingsboard.server.common.msg.TbActorMsg;
@@ -242,20 +243,26 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
     }
     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(deviceId);
+        rpc.setDeviceId(saveDeviceId);
         rpc.setExpirationTime(request.getExpirationTime());
         rpc.setRequest(JacksonUtil.valueToTree(request));
         rpc.setStatus(status);
 		rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo()));
-        //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());
-        }
+
         rpc.setAdditionalInfo(additional);
         return systemContext.getTbRpcService().save(tenantId, rpc);
--- a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
View file @e04221b
+++ b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
View file @e04221b
@@ -16,7 +16,9 @@
 package org.thingsboard.server.controller;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.FutureCallback;
+import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -35,8 +37,14 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 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.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.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rpc.LocalRequestMetaData;
 import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
@@ -62,6 +70,10 @@ public abstract class AbstractRpcController extends BaseController {
     @Autowired
     protected AccessValidator accessValidator;
+
+    @Autowired
+    protected TkDeviceService tkDeviceService;
+
     @Value("${server.rest.server_side_rpc.min_timeout:5000}")
     protected long minTimeout;
@@ -79,14 +91,28 @@ public abstract class AbstractRpcController extends BaseController {
             long expTime = rpcRequestBody.has(DataConstants.EXPIRATION_TIME) ? rpcRequestBody.get(DataConstants.EXPIRATION_TIME).asLong() : System.currentTimeMillis() + Math.max(minTimeout, timeout);
             UUID rpcRequestUUID = rpcRequestBody.has("requestUUID") ? UUID.fromString(rpcRequestBody.get("requestUUID").asText()) : UUID.randomUUID();
             boolean persisted = rpcRequestBody.has(DataConstants.PERSISTENT) && rpcRequestBody.get(DataConstants.PERSISTENT).asBoolean();
-            String additionalInfo =  JacksonUtil.toString(rpcRequestBody.get(DataConstants.ADDITIONAL_INFO));
+
+
+            //Thingskit function
+            DeviceDTO tkDevice = tkDeviceService.findDeviceInfoByTbDeviceId(currentUser.getCurrentTenantId(), deviceId.getId().toString());
+            ObjectNode additional = (ObjectNode) rpcRequestBody.get(DataConstants.ADDITIONAL_INFO);
+            if(additional == null){
+                additional = JacksonUtil.newObjectNode();
+            }
+            if(!additional.has(FastIotConstants.Rpc.TARGET_ID)){
+                additional.put(FastIotConstants.Rpc.TARGET_ID, deviceId.getId().toString());
+            }
+            DeviceId realDevice = DeviceTypeEnum.SENSOR == tkDevice.getDeviceType()?new DeviceId(UUID.fromString(tkDevice.getGatewayId())):deviceId;
+            String additionalInfo =  JacksonUtil.toString(additional);
+
             Integer retries = rpcRequestBody.has(DataConstants.RETRIES) ? rpcRequestBody.get(DataConstants.RETRIES).asInt() : null;
-            accessValidator.validate(currentUser, Operation.RPC_CALL, deviceId, new HttpValidationCallback(response, new FutureCallback<>() {
+            accessValidator.validate(currentUser, Operation.RPC_CALL, realDevice, new HttpValidationCallback(response, new FutureCallback<>() {
                 @Override
                 public void onSuccess(@Nullable DeferredResult<ResponseEntity> result) {
+
                     ToDeviceRpcRequest rpcRequest = new ToDeviceRpcRequest(rpcRequestUUID,
                             tenantId,
-                            deviceId,
+                            realDevice,
                             oneWay,
                             expTime,
                             body,
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/constant/FastIotConstants.java
View file @e04221b
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/constant/FastIotConstants.java
View file @e04221b
@@ -167,5 +167,7 @@ public interface FastIotConstants {
     public static String METHOD_NAME = "method";
     /**RPC参数*/
     public static String PARAMS_NAME = "params";
+    /**实控设备*/
+    public static String TARGET_ID = "target";
   }
 }