fix: 命令下发表单数据扩展

新增设备名称

@@ -83,18 +83,10 @@ public abstract class AbstractRpcController extends BaseController {
     protected DeferredResult<ResponseEntity> handleDeviceRPCRequest(boolean oneWay, DeviceId deviceId, String requestBody, HttpStatus timeoutStatus, HttpStatus noActiveConnectionStatus) throws ThingsboardException {
         try {
             JsonNode rpcRequestBody = JacksonUtil.toJsonNode(requestBody);
-            ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(rpcRequestBody.get("method").asText(), JacksonUtil.toString(rpcRequestBody.get("params")));
             SecurityUser currentUser = getCurrentUser();
-            TenantId tenantId = currentUser.getTenantId();
-            final DeferredResult<ResponseEntity> response = new DeferredResult<>();
-            long timeout = rpcRequestBody.has(DataConstants.TIMEOUT) ? rpcRequestBody.get(DataConstants.TIMEOUT).asLong() : defaultTimeout;
-            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();
-
 
             //Thingskit function
-            DeviceDTO tkDevice = tkDeviceService.findDeviceInfoByTbDeviceId(currentUser.getCurrentTenantId(), deviceId.getId().toString());
+            DeviceDTO targetDevice = tkDeviceService.findDeviceInfoByTbDeviceId(currentUser.getCurrentTenantId(), deviceId.getId().toString());
             ObjectNode additional = (ObjectNode) rpcRequestBody.get(DataConstants.ADDITIONAL_INFO);
             if(additional == null){
                 additional = JacksonUtil.newObjectNode();
@@ -102,9 +94,20 @@ public abstract class AbstractRpcController extends BaseController {
             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 methodName = rpcRequestBody.get("method").asText();
+            ObjectNode methodParams = (ObjectNode) rpcRequestBody.get("params");
+            methodParams.put(FastIotConstants.Rpc.TARGET_NAME,targetDevice.getName());
+            DeviceId realDevice = DeviceTypeEnum.SENSOR == targetDevice.getDeviceType()?new DeviceId(UUID.fromString(targetDevice.getGatewayId())):deviceId;
             String additionalInfo =  JacksonUtil.toString(additional);
 
+            ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(methodName, JacksonUtil.toString(methodParams));
+            TenantId tenantId = currentUser.getTenantId();
+            final DeferredResult<ResponseEntity> response = new DeferredResult<>();
+            long timeout = rpcRequestBody.has(DataConstants.TIMEOUT) ? rpcRequestBody.get(DataConstants.TIMEOUT).asLong() : defaultTimeout;
+            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();
+
             Integer retries = rpcRequestBody.has(DataConstants.RETRIES) ? rpcRequestBody.get(DataConstants.RETRIES).asInt() : null;
             accessValidator.validate(currentUser, Operation.RPC_CALL, realDevice, new HttpValidationCallback(response, new FutureCallback<>() {
                 @Override

@@ -169,5 +169,7 @@ public interface FastIotConstants {
     public static String PARAMS_NAME = "params";
     /**实控设备*/
     public static String TARGET_ID = "target";
+    /**实控设备名称*/
+    public static String TARGET_NAME = "deviceName";
   }
 }