Merge branch 'master_dev' into 20230724

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.CodeTypeEnum;
 
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
@@ -76,6 +77,9 @@ public class DeviceDTO extends TenantDTO {
   @ApiModelProperty(value = "设备标识符，例如：地址码")
   @ApiModelProperty(value = "设备标识符，例如：地址码")
   private String code;
   private String code;
 
 
+  @ApiModelProperty(value = "标识符/地址码类型：产品协议为TCP/UDP使用,MODBUS/CUSTOM")
+  private CodeTypeEnum codeType;
+
   @NotEmpty(
   @NotEmpty(
       message = "所属组织不能为空或者空字符串",
       message = "所属组织不能为空或者空字符串",
       groups = {AddGroup.class})
       groups = {AddGroup.class})

@@ -3,12 +3,12 @@ package org.thingsboard.server.common.data.yunteng.dto.task;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
-import org.thingsboard.server.common.data.yunteng.enums.TaskTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.CodeTypeEnum;
 
 
 @Data
 @Data
 public class TaskTypeDTO {
 public class TaskTypeDTO {
   @ApiModelProperty(value = "类型")
   @ApiModelProperty(value = "类型")
-  private TaskTypeEnum type = TaskTypeEnum.CUSTOM;
+  private CodeTypeEnum type = CodeTypeEnum.CUSTOM;
 
 
   @ApiModelProperty(value = "推送方式：MQTT TCP")
   @ApiModelProperty(value = "推送方式：MQTT TCP")
   private String pushWay;
   private String pushWay;

 package org.thingsboard.server.common.data.yunteng.enums;
 package org.thingsboard.server.common.data.yunteng.enums;
 
 
-public enum TaskTypeEnum {
+public enum CodeTypeEnum {
   CUSTOM,
   CUSTOM,
-  MODBUS_RTU
+  MODBUS
 }
 }

@@ -10,6 +10,7 @@ import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.CodeTypeEnum;
 
 
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
@@ -28,6 +29,8 @@ public class TkDeviceEntity extends TenantBaseEntity {
   private String brand;
   private String brand;
   private String label;
   private String label;
   private String code;
   private String code;
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private CodeTypeEnum codeType;
 
 
   @TableField(typeHandler = EnumTypeHandler.class)
   @TableField(typeHandler = EnumTypeHandler.class)
   private DeviceTypeEnum deviceType;
   private DeviceTypeEnum deviceType;

@@ -21,6 +21,7 @@
         <result property="brand" column="brand" />
         <result property="brand" column="brand" />
         <result property="sn" column="sn"/>
         <result property="sn" column="sn"/>
         <result property="code" column="code"/>
         <result property="code" column="code"/>
+        <result property="codeType" column="code_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="tbDeviceId" column="tb_device_id"/>
         <result property="tbDeviceId" column="tb_device_id"/>
         <result property="label" column="label"/>
         <result property="label" column="label"/>
@@ -72,7 +73,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="basicColumns">
     <sql id="basicColumns">
-        ifd.id,ifd.gateway_id,ifd.code
+        ifd.id,ifd.gateway_id,ifd.code,ifd.code_type
         ,ifd.sn,ifd.brand,ifd.name,ifd.alias,ifd.device_info,ifd.profile_id,ifd.device_profile_id,ifd.active_time,ifd.tenant_id,ifd.description
         ,ifd.sn,ifd.brand,ifd.name,ifd.alias,ifd.device_info,ifd.profile_id,ifd.device_profile_id,ifd.active_time,ifd.tenant_id,ifd.description
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
         ifd.updater,ifd.organization_id,ifd.alarm_status
         ifd.updater,ifd.organization_id,ifd.alarm_status