refactor: RPC状态返回命令类型

@@ -36,6 +36,7 @@ import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
 import org.thingsboard.server.actors.stats.StatsPersistTick;
 import org.thingsboard.server.common.data.DataConstants;
 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.edge.EdgeEvent;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -245,7 +246,15 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         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.isEmpty() ?mapper.createObjectNode():(ObjectNode)old;
+        if(!additional.has("cmdType")){
+            additional.put("cmdType", DeviceTransportType.MQTT.name());
+        }
+        rpc.setAdditionalInfo(additional);
+
         return systemContext.getTbRpcService().save(tenantId, rpc);
     }
 

@@ -155,6 +155,7 @@ public class JsonConverter {
     }
 
     public static JsonElement toJson(TransportProtos.ToDeviceRpcRequestMsg msg, boolean includeRequestId) {
+        //Thingskit function
         JsonObject result = null;
         if("methodThingskit".equals(msg.getMethodName())){
             result= JSON_PARSER.parse(msg.getParams()).getAsJsonObject();
@@ -163,6 +164,8 @@ public class JsonConverter {
             result.addProperty("method", msg.getMethodName());
             result.add("params", JSON_PARSER.parse(msg.getParams()));
         }
+
+
         if (includeRequestId) {
             result.addProperty("id", msg.getRequestId());
         }