fix: 命令下发记录内容不一致问题修复

@@ -282,8 +282,6 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
     rpc.setExpirationTime(request.getExpirationTime());
     rpc.setExpirationTime(request.getExpirationTime());
     rpc.setRequest(JacksonUtil.valueToTree(request));
     rpc.setRequest(JacksonUtil.valueToTree(request));
     rpc.setStatus(status);
     rpc.setStatus(status);
-    rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo()));
-
     rpc.setAdditionalInfo(additional);
     rpc.setAdditionalInfo(additional);
 
 
     return systemContext.getTbRpcService().save(tenantId, rpc);
     return systemContext.getTbRpcService().save(tenantId, rpc);

@@ -81,7 +81,12 @@ public abstract class AbstractRpcController extends BaseController {
     protected DeferredResult<ResponseEntity> handleDeviceRPCRequest(boolean oneWay, DeviceId deviceId, String requestBody, HttpStatus timeoutStatus, HttpStatus noActiveConnectionStatus) throws ThingsboardException {
     protected DeferredResult<ResponseEntity> handleDeviceRPCRequest(boolean oneWay, DeviceId deviceId, String requestBody, HttpStatus timeoutStatus, HttpStatus noActiveConnectionStatus) throws ThingsboardException {
         try {
         try {
             JsonNode rpcRequestBody = JacksonUtil.toJsonNode(requestBody);
             JsonNode rpcRequestBody = JacksonUtil.toJsonNode(requestBody);
-            ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(rpcRequestBody.get("method").asText(), JacksonUtil.toString(rpcRequestBody.get("params")));
+
+            //Thingskit function
+            JsonNode paramJson = rpcRequestBody.get("params");
+            String paramStr =paramJson.isTextual()?paramJson.asText():JacksonUtil.toString(paramJson);
+
+            ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(rpcRequestBody.get("method").asText(), paramStr);
             SecurityUser currentUser = getCurrentUser();
             SecurityUser currentUser = getCurrentUser();
             TenantId tenantId = currentUser.getTenantId();
             TenantId tenantId = currentUser.getTenantId();
             final DeferredResult<ResponseEntity> response = new DeferredResult<>();
             final DeferredResult<ResponseEntity> response = new DeferredResult<>();

@@ -173,8 +173,9 @@ public class RpcCommandTask {
       SecurityUser securityUser,
       SecurityUser securityUser,
       String taskCenterId) {
       String taskCenterId) {
     JsonNode rpcCommand = cmdJsonNode.get(FastIotConstants.RPC_COMMAND);
     JsonNode rpcCommand = cmdJsonNode.get(FastIotConstants.RPC_COMMAND);
+    String paramStr =rpcCommand.isTextual()?rpcCommand.asText():JacksonUtil.toString(rpcCommand);
     ToDeviceRpcRequestBody body =
     ToDeviceRpcRequestBody body =
-        new ToDeviceRpcRequestBody("methodThingskit", JacksonUtil.toString(rpcCommand));
+        new ToDeviceRpcRequestBody(FastIotConstants.Rpc.METHOD_NAME_VALUE, paramStr);
     DeviceId deviceId = new DeviceId(UUID.fromString(originateId));
     DeviceId deviceId = new DeviceId(UUID.fromString(originateId));
     ObjectNode objectNode = JacksonUtil.newObjectNode();
     ObjectNode objectNode = JacksonUtil.newObjectNode();
     objectNode.put(
     objectNode.put(

@@ -165,6 +165,7 @@ public interface FastIotConstants {
 
 
     /**RPC方法名*/
     /**RPC方法名*/
     public static String METHOD_NAME = "method";
     public static String METHOD_NAME = "method";
+    public static String METHOD_NAME_VALUE = "methodThingskit";
     /**RPC参数*/
     /**RPC参数*/
     public static String PARAMS_NAME = "params";
     public static String PARAMS_NAME = "params";
     /**实控设备*/
     /**实控设备*/

@@ -136,12 +136,8 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
 
 
     @Override
     @Override
     public Optional<TcpDownEntry> convertToPublish(TcpDeviceWareSessionContext ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) throws ExecutionException, InterruptedException {
     public Optional<TcpDownEntry> convertToPublish(TcpDeviceWareSessionContext ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) throws ExecutionException, InterruptedException {
-//        ListenableFuture<Object> result = ctx.getContext().getJsEngine().invokeFunction(ctx.getRpcScriptId(),  rpcRequest.getParams());
-//        return Optional.of(Futures.transform(result, t -> JacksonUtil.fromString(t.toString(), TcpDownEntry.class), MoreExecutors.directExecutor()).get());
         String payload = rpcRequest.getParams();//methodThingskit
         String payload = rpcRequest.getParams();//methodThingskit
-        if (!payload.startsWith("{") && !payload.endsWith("}")) {
-            payload = payload.replace("\"","").replace(" ","");
-        }
+
         TcpDownEntry data = new TcpDownEntry();
         TcpDownEntry data = new TcpDownEntry();
         data.setDatas(payload);
         data.setDatas(payload);
         data.setIdentifier(payload);
         data.setIdentifier(payload);

@@ -21,6 +21,7 @@ import org.springframework.util.StringUtils;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.kv.*;
 import org.thingsboard.server.common.data.kv.*;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.*;
 import org.thingsboard.server.gen.transport.TransportProtos.*;
 
 
@@ -136,7 +137,7 @@ public class JsonConverter {
     public static JsonElement toJson(TransportProtos.ToDeviceRpcRequestMsg msg, boolean includeRequestId) {
     public static JsonElement toJson(TransportProtos.ToDeviceRpcRequestMsg msg, boolean includeRequestId) {
         //Thingskit function
         //Thingskit function
         JsonObject result = null;
         JsonObject result = null;
-        if("methodThingskit".equals(msg.getMethodName())){
+        if(FastIotConstants.Rpc.METHOD_NAME_VALUE.equals(msg.getMethodName())){
             result= JSON_PARSER.parse(msg.getParams()).getAsJsonObject();
             result= JSON_PARSER.parse(msg.getParams()).getAsJsonObject();
         }else{
         }else{
             result = new JsonObject();
             result = new JsonObject();

@@ -252,7 +252,7 @@ public class TkSceneLinkageServiceImpl
                       JsonNode inputContext =
                       JsonNode inputContext =
                           doActionDTO.getDoContext().get(FastIotConstants.Rpc.PARAMS_NAME);
                           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, FastIotConstants.Rpc.METHOD_NAME_VALUE);
                       if (inputContext == null) {
                       if (inputContext == null) {
                         outputContext.put(FastIotConstants.Rpc.PARAMS_NAME, "");
                         outputContext.put(FastIotConstants.Rpc.PARAMS_NAME, "");
                       } else if (inputContext.isTextual()) {
                       } else if (inputContext.isTextual()) {