refactor: 命令下发记录命令类型

1、新增命令下发类型的枚举
2、默认命令下发类型：自定义
3、场景联动后端组装命令下发类型

@@ -58,6 +58,8 @@ 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.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.CmdTypeEnum;
 import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.TbCallback;
@@ -251,8 +253,8 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         //Thingskit function
         JsonNode old = JacksonUtil.toJsonNode(request.getAdditionalInfo());
         ObjectNode additional = (old == null || old.isEmpty()) ?mapper.createObjectNode():(ObjectNode)old;
-        if(!additional.has("cmdType")){
-            additional.put("cmdType", DeviceTransportType.MQTT.name());
+        if(!additional.has(ModelConstants.TablePropertyMapping.COMMAND_TYPE)){
+            additional.put(ModelConstants.TablePropertyMapping.COMMAND_TYPE, CmdTypeEnum.DIY.ordinal());
         }
         rpc.setAdditionalInfo(additional);
 

@@ -131,6 +131,7 @@ public final class ModelConstants {
     public static final String TB_DEVICE_ID = "tbDeviceId";
     public static final String DEVICE_STATE = "deviceState";
     public static final String ACTIVE_TIME = "activeTime";
+    public static final String COMMAND_TYPE = "cmdType";
     public static final String ADDITIONALINFO_DESCRIPTION = "description";
   }
 

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/**
+ * 命令下发类型
+ */
+public enum CmdTypeEnum {
+    //自定义
+    DIY,
+    //服务
+    SERVICE
+}

@@ -9,8 +9,10 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.id.EntityId;
 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.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
@@ -251,6 +253,9 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
                       ObjectNode doContext = JacksonUtil.newObjectNode();
                       doContext.put("method", "methodThingskit");
                       doContext.put("params", doActionDTO.getDoContext());
+                      ObjectNode addtionalInfo = JacksonUtil.newObjectNode();
+                      addtionalInfo.put(ModelConstants.TablePropertyMapping.COMMAND_TYPE, doActionDTO.getCommandType());
+                      doContext.put(DataConstants.ADDITIONAL_INFO, addtionalInfo);
                       doActionDTO.setDoContext(doContext);
                     }
                     return doActionDTO.getEntity(TkDoActionEntity.class);