fix: add thingsModel and change table name

+package org.thingsboard.server.controller.yunteng;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
+import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+
+import java.util.HashMap;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/yt/things_model")
+@Api(tags = {"物模型管理"})
+public class ThingsModelController extends BaseController {
+  private final ThingsModelService thingsModelService;
+  private final YtDeviceProfileService ytDeviceProfileService;
+
+  @GetMapping(
+      path = "/page",
+      params = {PAGE_SIZE, PAGE})
+  @ApiOperation(value = "分页")
+  public YtPageData<ThingsModelDTO> page(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "nameOrIdentifier", required = false) String nameOrIdentifier,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put("nameOrIdentifier", nameOrIdentifier);
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    return thingsModelService.page(queryMap, getCurrentUser().getCurrentTenantId());
+  }
+
+  @PostMapping()
+  @ApiOperation("保存物模型")
+  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:post'})")
+  public ResponseEntity<ThingsModelDTO> save(
+      @Validated(AddGroup.class) @RequestBody ThingsModelDTO thingsModelDTO)
+      throws ThingsboardException {
+    return ResponseEntity.ok(saveOrUpdate(thingsModelDTO));
+  }
+
+  @PutMapping()
+  @ApiOperation("修改物模型")
+  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:put'})")
+  public ResponseEntity<ThingsModelDTO> update(
+      @Validated(UpdateGroup.class) @RequestBody ThingsModelDTO thingsModelDTO)
+      throws ThingsboardException {
+    return ResponseEntity.ok(saveOrUpdate(thingsModelDTO));
+  }
+
+  @DeleteMapping
+  @ApiOperation("删除")
+  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:delete'})")
+  public boolean delete(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return thingsModelService.delete(deleteDTO);
+  }
+
+  @GetMapping("/{functionType}/{deviceProfileId}")
+  @ApiOperation("获取物模型TSL")
+  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:json:view'})")
+  public ResponseEntity<JsonNode> getTSL(
+      @PathVariable("functionType") FunctionTypeEnum functionType,
+      @PathVariable("deviceProfileId") String deviceProfileId)
+      throws ThingsboardException {
+    return ResponseEntity.ok(
+        thingsModelService.getTingsModelJson(
+            functionType, getCurrentUser().getCurrentTenantId(), deviceProfileId));
+  }
+
+  private ThingsModelDTO saveOrUpdate(ThingsModelDTO thingsModelDTO) throws ThingsboardException {
+
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    DeviceProfileDTO deviceProfileDTO =
+        ytDeviceProfileService.findDeviceProfileById(tenantId, thingsModelDTO.getDeviceProfileId());
+    if (null == deviceProfileDTO) {
+      throw new YtDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+    }
+    thingsModelDTO.setTenantId(tenantId);
+    return thingsModelService.saveOrUpdate(thingsModelDTO);
+  }
+}

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -18,7 +17,6 @@ import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMs
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
-import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -38,6 +36,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -58,7 +57,7 @@ public class YtDeviceController extends BaseController {
   private final YtDeviceService deviceService;
   private final DeviceService tbDeviceService;
   private final ObjectMapper objectMapper;
-  String sePL = new Date().toString();
+  private final YtDeviceProfileService ytDeviceProfileService;
 
   @PostMapping
   @ApiOperation("创建|编辑")
@@ -68,66 +67,59 @@ public class YtDeviceController extends BaseController {
       @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO)
       throws ThingsboardException, ExecutionException, InterruptedException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
-    deviceService.validateFormdata(currentTenantId, deviceDTO);
+    deviceService.validateFormData(currentTenantId, deviceDTO);
 
-
-
-
-    /**网关是否有效*/
+    /** 网关是否有效 */
     String gatewayId = deviceDTO.getGatewayId();
     DeviceDTO gateWay = null;
     if (StringUtils.isNotEmpty(gatewayId)) {
-      gateWay = deviceService.checkDeviceByTenantIdAndDeviceId(getCurrentUser().getCurrentTenantId(), gatewayId);
+      gateWay =
+          deviceService.checkDeviceByTenantIdAndDeviceId(
+              getCurrentUser().getCurrentTenantId(), gatewayId);
       if (null == gateWay) {
         throw new YtDataValidationException(
             ErrorMessage.DEVICE_NOT_EXISTENCE_IN_TENANT.getMessage());
       }
     }
 
-
-
-
-    /** 子设备编辑业务逻辑： 设备地址码必须同时设置到附加信息字段内。
-     *     1、新增或编辑网关和直连设备
-     *     2、新增网关子设备
-     *     3、编辑网关子设备时，关联关系已存在(未切换网关)
-     *     4、编辑网关子设备时，关联关系不存在(切换网关)
-     *     5、编辑网关子设备时，修改其它设备信息，例如：设备名称等。
-     *     */
+    /**
+     * 子设备编辑业务逻辑： 设备地址码必须同时设置到附加信息字段内。 1、新增或编辑网关和直连设备 2、新增网关子设备 3、编辑网关子设备时，关联关系已存在(未切换网关)
+     * 4、编辑网关子设备时，关联关系不存在(切换网关) 5、编辑网关子设备时，修改其它设备信息，例如：设备名称等。
+     */
     Device tbDevice = buildTbDeviceFromDeviceDTO(getCurrentUser().getTenantId(), deviceDTO);
     DeviceId selfTbId = updateTbDevice(tbDevice, deviceDTO.getDeviceToken());
     String selfTbIdStr = selfTbId.getId().toString();
     deviceDTO.setTbDeviceId(selfTbIdStr);
 
-
     if (selfTbIdStr != null
-            && deviceDTO.getDeviceType().equals(DeviceTypeEnum.SENSOR)
-            && StringUtils.isNotEmpty(gatewayId)) {
+        && deviceDTO.getDeviceType().equals(DeviceTypeEnum.SENSOR)
+        && StringUtils.isNotEmpty(gatewayId)) {
       boolean relationNotMatched = true;
 
       EntityId slaveId = EntityIdFactory.getByTypeAndId("DEVICE", selfTbIdStr);
-      List<EntityRelationInfo> relations = relationService.findInfoByTo(getTenantId(), slaveId, RelationTypeGroup.COMMON).get();
+      List<EntityRelationInfo> relations =
+          relationService.findInfoByTo(getTenantId(), slaveId, RelationTypeGroup.COMMON).get();
 
       for (EntityRelationInfo relationInfo : relations) {
-        if(!FastIotConstants.Relation.relationType.equals(relationInfo.getType())){
+        if (!FastIotConstants.Relation.relationType.equals(relationInfo.getType())) {
           continue;
         }
         if (relationInfo.getFrom().getId().toString().equals(gateWay.getTbDeviceId())) {
           relationNotMatched = false;
-        }else {
-          relationService.deleteRelation(getTenantId(),relationInfo);
-          sendRelationNotificationMsg(getTenantId(), relationInfo, EdgeEventActionType.RELATION_DELETED);
+        } else {
+          relationService.deleteRelation(getTenantId(), relationInfo);
+          sendRelationNotificationMsg(
+              getTenantId(), relationInfo, EdgeEventActionType.RELATION_DELETED);
         }
       }
 
-      if(relationNotMatched){
+      if (relationNotMatched) {
         addRelation(getTenantId(), gateWay.getTbDeviceId(), selfTbIdStr);
       }
     }
 
-
-
-    DeviceDTO newDeviceDTO = deviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
+    DeviceDTO newDeviceDTO =
+        deviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
     return ResponseEntity.ok(newDeviceDTO);
   }
 
@@ -334,25 +326,29 @@ public class YtDeviceController extends BaseController {
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
   @ApiOperation("获取特定设备类型的所有设备")
   public List<DeviceDTO> getGatewayDevices(
-
-          @ApiParam(value = "设备类型") @PathVariable("deviceType") DeviceTypeEnum deviceType,
-          @ApiParam(value = "组织ID") @RequestParam(value="organizationId", required = false) String organizationId,
-          @ApiParam(value = "设备标签") @RequestParam(value="deviceLabel", required = false) String deviceLabel)
-          throws ThingsboardException {
+      @ApiParam(value = "设备类型") @PathVariable("deviceType") DeviceTypeEnum deviceType,
+      @ApiParam(value = "组织ID") @RequestParam(value = "organizationId", required = false)
+          String organizationId,
+      @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
+          String deviceLabel)
+      throws ThingsboardException {
     return deviceService.findDevicesByDeviceTypeAndOrganizationId(
-            deviceType, getCurrentUser().getCurrentTenantId(), organizationId,deviceLabel);
+        deviceType, getCurrentUser().getCurrentTenantId(), organizationId, deviceLabel);
   }
 
   @GetMapping("/list")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @ApiOperation("获取满足条件的所有设备")
   public List<DeviceDTO> getDevices(
-          @ApiParam(value = "设备类型") @RequestParam(value="deviceType", required = false) DeviceTypeEnum deviceType,
-          @ApiParam(value = "组织ID") @RequestParam(value="organizationId", required = false) String organizationId,
-          @ApiParam(value = "设备标签") @RequestParam(value="deviceLabel", required = false) String deviceLabel)
-          throws ThingsboardException {
+      @ApiParam(value = "设备类型") @RequestParam(value = "deviceType", required = false)
+          DeviceTypeEnum deviceType,
+      @ApiParam(value = "组织ID") @RequestParam(value = "organizationId", required = false)
+          String organizationId,
+      @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
+          String deviceLabel)
+      throws ThingsboardException {
     return deviceService.findDevicesByDeviceTypeAndOrganizationId(
-            deviceType, getCurrentUser().getCurrentTenantId(), organizationId,deviceLabel);
+        deviceType, getCurrentUser().getCurrentTenantId(), organizationId, deviceLabel);
   }
 
   @GetMapping("/list/master/{organizationId}")
@@ -427,7 +423,7 @@ public class YtDeviceController extends BaseController {
       tbDevice.setId(id);
     }
 
-    /**扩展设备附加信息，例如：设备地址码、上下线时间等*/
+    /** 扩展设备附加信息，例如：设备地址码、上下线时间等 */
     ObjectNode additionalInfo = objectMapper.createObjectNode();
     additionalInfo.put(
         "gateway",
@@ -441,9 +437,9 @@ public class YtDeviceController extends BaseController {
             .map(JsonNode::asText)
             .orElse(""));
     additionalInfo.put("overwriteActivityTime", false);
-    //TCP协议需要设备地址码分发数据给对应设备
-    if(StringUtils.isNotEmpty(deviceDTO.getCode())){
-      additionalInfo.put(FastIotConstants.TCP_DEVICE_IDENTIFY_FILED,deviceDTO.getCode());
+    // TCP协议需要设备地址码分发数据给对应设备
+    if (StringUtils.isNotEmpty(deviceDTO.getCode())) {
+      additionalInfo.put(FastIotConstants.TCP_DEVICE_IDENTIFY_FILED, deviceDTO.getCode());
     }
 
     DeviceProfileId deviceProfileId =
@@ -487,4 +483,17 @@ public class YtDeviceController extends BaseController {
     result.setMessage(str);
     return result;
   }
+
+  @GetMapping({"/attributes/{profileId}/{id}"})
+  @ApiOperation("获取设备的属性")
+  public ResponseEntity<JsonNode> getDeviceAttributes(
+      @PathVariable("profileId") String profileId, @PathVariable("id") String id)
+      throws ThingsboardException {
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    DeviceProfileDTO dto = ytDeviceProfileService.findByTbDeviceProfileId(tenantId, profileId);
+    if (null == dto) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseEntity.ok(deviceService.getDeviceAttributes(profileId,dto.getId(), id, tenantId));
+  }
 }

@@ -176,7 +176,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
 
     @Override
     public void createSysAdmin() {
-        createUser(Authority.SYS_ADMIN, null, null, "sysadmin@qq.com", "Sysadmin@123");
+        createUser(Authority.SYS_ADMIN, null, null, "sysadmin@yunteng.com", "Sysadmin@123");
     }
 
     @Override

@@ -3,63 +3,63 @@ package org.thingsboard.server.common.data.yunteng.constant;
 public final class ModelConstants {
   public static class Table {
     /** 系统用户表 */
-    public static final String USER_TABLE_NAME = "sys_user";
+    public static final String SYS_USER_TABLE_NAME = "sys_user";
     /** 租户表 */
-    public static final String TENANT_TABLE_NAME = "sys_tenant";
+    public static final String SYS_TENANT_TABLE_NAME = "sys_tenant";
     /** 租户菜单表 */
-    public static final String TENANT_MENU_TABLE_NAME = "sys_tenant_menu";
+    public static final String SYS_TENANT_MENU_TABLE_NAME = "sys_tenant_menu";
     /** 租户角色表 */
-    public static final String TENANT_ROLE_TABLE_NAME = "sys_tenant_role";
+    public static final String SYS_TENANT_ROLE_TABLE_NAME = "sys_tenant_role";
     /** 菜单表 */
-    public static final String MENU_TABLE_NAME = "sys_menu";
+    public static final String SYS_MENU_TABLE_NAME = "sys_menu";
     /** 通知管理 */
     public static final String SYS_NOTICE_TABLE_NAME = "sys_notice";
     /** 我的通知 */
     public static final String SYS_NOTICE_USER_TABLE_NAME = "sys_notice_user";
     /** 角色表 */
-    public static final String ROLE_TABLE_NAME = "sys_role";
+    public static final String SYS_ROLE_TABLE_NAME = "sys_role";
     /** 用户角色关系表 */
-    public static final String USER_ROLE_TABLE_NAME = "sys_user_role";
+    public static final String SYS_USER_ROLE_TABLE_NAME = "sys_user_role";
     /** 系统用户设置表 */
-    public static final String ADMIN_SETTING_TABLE_NAME = "sys_admin_setting";
+    public static final String SYS_ADMIN_SETTING_TABLE_NAME = "sys_admin_setting";
     /** 字典表 */
-    public static final String DICT_TABLE_NAME = "sys_dict";
+    public static final String SYS_DICT_TABLE_NAME = "sys_dict";
     /** 字典值表 */
-    public static final String DICT_ITEM_TABLE_NAME = "sys_dict_item";
+    public static final String SYS_DICT_ITEM_TABLE_NAME = "sys_dict_item";
     /** 消息字典表 */
-    public static final String MESSAGE_CONFIG_TABLE_NAME = "message_config";
+    public static final String TK_MESSAGE_CONFIG_TABLE_NAME = "tk_message_config";
     /** 消息模板表 */
-    public static final String MESSAGE_TEMPLATE_TABLE_NAME = "message_template";
+    public static final String TK_MESSAGE_TEMPLATE_TABLE_NAME = "tk_message_template";
     /** 短信发送记录表 */
-    public static final String SMS_LOG_TABLE_NAME = "sms_log";
+    public static final String TK_SMS_LOG_TABLE_NAME = "tk_sms_log";
     /** 邮件发送记录表 */
-    public static final String MAIL_LOG_TABLE_NAME = "mail_log";
+    public static final String TK_MAIL_LOG_TABLE_NAME = "tk_mail_log";
     /** 限流表 */
-    public static final String RATE_LIMIT_TABLE_NAME = "sys_rate_limit";
+    public static final String SYS_RATE_LIMIT_TABLE_NAME = "sys_rate_limit";
     /** 系统部门表 */
-    public static final String DEPT_TABLE_NAME = "sys_dept";
+    public static final String SYS_DEPT_TABLE_NAME = "sys_dept";
     /** 系统定时任务表 */
-    public static final String JOB_TABLE_NAME = "sys_job";
+    public static final String SYS_JOB_TABLE_NAME = "sys_job";
     /** 定时任务执行记录表 */
-    public static final String JOB_LOG_TABLE_NAME = "sys_job_log";
+    public static final String SYS_JOB_LOG_TABLE_NAME = "sys_job_log";
     /** 组织表 */
-    public static final String IOTFS_ORGANIZATION_TABLE_NAME = "iotfs_organization";
+    public static final String TK_ORGANIZATION_TABLE_NAME = "tk_organization";
     /** 用户与组织映射表 */
-    public static final String IOTFS_USER_ORGANIZATION_MAPPING_TABLE_NAME =
-        "iotfs_user_organization_mapping";
+    public static final String TK_USER_ORGANIZATION_MAPPING_TABLE_NAME =
+        "tk_user_organization_mapping";
     /** 设备表 */
-    public static final String IOTFS_DEVICE_TABLE_NAME = "iotfs_device";
+    public static final String TK_DEVICE_TABLE_NAME = "tk_device";
     /** 产品信息(设备配置)扩展表 */
-    public static final String IOTFS_DEVICE_PROFILE_TABLE_NAME = "iotfs_device_profile";
+    public static final String TK_DEVICE_PROFILE_TABLE_NAME = "tk_device_profile";
     /** 自定义数据协议解析脚本 */
-    public static final String IOTFS_DEVICE_SCRIPT_TABLE_NAME = "iotfs_java_script";
+    public static final String TK_DEVICE_SCRIPT_TABLE_NAME = "tk_java_script";
 
     /** 设备类型表 */
-    public static final String IOTFS_DEVICE_TYPE_TABLE_NAME = "iotfs_device_type";
+    public static final String TK_DEVICE_TYPE_TABLE_NAME = "tk_device_type";
     /** 告警配置表 */
-    public static final String IOTFS_ALARM_PROFILE_TABLE_NAME = "iotfs_alarm_profile";
+    public static final String TK_ALARM_PROFILE_TABLE_NAME = "tk_alarm_profile";
     /** 告警联系人 */
-    public static final String IOTFS_ALARM_CONTACT_TABLE_NAME = "iotfs_alarm_contact";
+    public static final String TK_ALARM_CONTACT_TABLE_NAME = "tk_alarm_contact";
     /** 企业信息 */
     public static final String SYS_ENTERPRISE_TABLE_NAME = "sys_enterprise";
     /** 平台定制 */
@@ -67,47 +67,47 @@ public final class ModelConstants {
     /** APP定制 */
     public static final String SYS_APP_DESIGN_TABLE_NAME = "sys_app_design";
     /** 场景联动表 */
-    public static final String IOTFS_SCENE_LINKAGE_TABLE_NAME = "iotfs_scene_linkage";
+    public static final String TK_SCENE_LINKAGE_TABLE_NAME = "tk_scene_linkage";
     /** 场景触发器 */
-    public static final String IOTFS_TRIGGER_TABLE_NAME = "iotfs_trigger";
+    public static final String TK_TRIGGER_TABLE_NAME = "tk_trigger";
     /** 执行条件表 */
-    public static final String IOTFS_DO_CONDITION_TABLE_NAME = "iotfs_do_condition";
+    public static final String TK_DO_CONDITION_TABLE_NAME = "tk_do_condition";
     /** 条件动作表 */
-    public static final String IOTFS_DO_ACTION_TABLE_NAME = "iotfs_do_action";
+    public static final String TK_DO_ACTION_TABLE_NAME = "tk_do_action";
     /** 中国城镇区街 */
     public static final String SYS_AREA_TABLE_NAME = "sys_area";
     /** 数据流转配置表 */
-    public static final String IOTFS_CONVERT_CONFIG_TABLE_NAME = "iotfs_convert_config";
+    public static final String TK_CONVERT_CONFIG_TABLE_NAME = "tk_convert_config";
     /** 组态中心 */
-    public static final String IOTFS_CONFIGURATION_CENTER_NAME = "iotfs_configuration_center";
+    public static final String TK_CONFIGURATION_CENTER_NAME = "tk_configuration_center";
     /** 组态内容 */
-    public static final String IOTFS_CONFIGURATION_CONTENT_NAME = "iotfs_configuration_content";
+    public static final String TK_CONFIGURATION_CONTENT_NAME = "tk_configuration_content";
     /** 组态节点数据源 */
-    public static final String IOTFS_CONFIGURATION_DATASOURCE = "iotfs_configuration_datasource";
+    public static final String TK_CONFIGURATION_DATASOURCE = "tk_configuration_datasource";
     /** 组态节点数据交互 */
-    public static final String IOTFS_CONFIGURATION_EVENT = "iotfs_configuration_event";
+    public static final String TK_CONFIGURATION_EVENT = "tk_configuration_event";
     /** 组态节点动画效果 */
-    public static final String IOTFS_CONFIGURATION_ACT = "iotfs_configuration_act";
+    public static final String TK_CONFIGURATION_ACT = "tk_configuration_act";
     /** 视频流 */
-    public static final String IOTFS_VIDEO_STREAM_TABLE_NAME = "iotfs_device_camera";
+    public static final String TK_VIDEO_STREAM_TABLE_NAME = "tk_device_camera";
     /** 流媒体配置 */
-    public static final String IOTFS_VIDEO_PLATFORM_TABLE_NAME = "iotfs_video_platform";
+    public static final String TK_VIDEO_PLATFORM_TABLE_NAME = "tk_video_platform";
     /** 意见反馈 */
-    public static final String IOTFS_OPINION_TABLE_NAME = "iotfs_opinion";
+    public static final String TK_OPINION_TABLE_NAME = "tk_opinion";
     /** 第三方用户表 */
-    public static final String IOTFS_THIRD_USER_TABLE_NAME = "iotfs_third_user";
+    public static final String TK_THIRD_USER_TABLE_NAME = "tk_third_user";
     /** frp内网穿透信息表 */
-    public static final String IOTFS_FRP_INFO_NAME = "iotfs_frp_info";
+    public static final String TK_FRP_INFO_NAME = "tk_frp_info";
     /** 报表配置表 */
-    public static final String IOTFS_REPORT_FORM_CONFIG_NAME = "iotfs_report_form_config";
+    public static final String TK_REPORT_FORM_CONFIG_NAME = "tk_report_form_config";
     /** 报表生成记录表 */
-    public static final String IOTFS_REPORT_GENERATE_RECORD_NAME = "iotfs_report_generate_record";
+    public static final String TK_REPORT_GENERATE_RECORD_NAME = "tk_report_generate_record";
     /** 数据看板 */
-    public static final String IOTFS_DATA_BOARD_NAME = "iotfs_data_board";
+    public static final String TK_DATA_BOARD_NAME = "tk_data_board";
     /** 数据组件 */
-    public static final String IOTFS_DATA_COMPONENT_NAME = "iotfs_data_component";
+    public static final String TK_DATA_COMPONENT_NAME = "tk_data_component";
     /** 物模型 */
-    public static final String IOTFS_THING_MODEL = "iotfs_model";
+    public static final String TK_THING_MODEL = "tk_things_model";
   }
 
   public static class TableFields {

@@ -84,6 +84,7 @@ public enum ErrorMessage {
   MESSAGE_SEND_FAILED(4010060, "消息发送失败!"),
   PROJECT_USED_SCRIPT(400061,"产品【%s】正在使用待删除的解析脚本"),
   RULE_CHAIN_NOT_ENABLE(400062,"规则链不是有效的！"),
+  DUPLICATE_IDENTIFIERS_EXIST(400063,"存在重复的功能标识符。"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.DataTypeEnum;
+
+@Data
+@ApiModel("属性模型")
+public class AttributeModelDTO extends BaseModelDTO {
+  @ApiModelProperty("数据类型")
+  private DataTypeEnum dataType;
+
+  @ApiModelProperty("读写类型：0只读 1读写")
+  private Integer readWrite;
+
+  @ApiModelProperty("规格内容")
+  private JsonNode specs;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseModelDTO {
+  @ApiModelProperty("功能名称")
+  private String functionName;
+
+  @ApiModelProperty("标识符")
+  private String identifier;
+
+  @ApiModelProperty("备注")
+  private String remark;
+}

@@ -26,6 +26,8 @@ public class DeviceDTO extends TenantDTO {
      */
     private JsonNode deviceInfo;
 
+    @ApiModelProperty(value = "别名")
+    private String alias;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime activeTime;
 

 package org.thingsboard.server.common.data.yunteng.dto;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,7 +17,6 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.Optional;
 import java.util.UUID;
@@ -26,72 +24,84 @@ import java.util.UUID;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class DeviceProfileDTO extends BaseDTO {
-    @NotEmpty(message = "设备配置名称不能为空或者空字符串", groups = AddGroup.class)
-    @ApiModelProperty(value = "产品(设备配置)名称")
-    private String name;
-
-    private String description;
-
-    /**
-     * TCP协议的解析脚本ID，由后端自己回填
-     */
-    private String scriptId;
-
-    @ApiModelProperty(value = "租户ID")
-    private String tenantId;
-    @NotEmpty(message = "传输协议不能为空或者空字符串", groups = AddGroup.class)
-    @ApiModelProperty(value = "传输协议", required = true)
-    private String transportType;
-
-    private String provisionType;
-
-    @NotNull(message = "产品类型不能为空", groups = {AddGroup.class})
-    @ApiModelProperty(value = "产品类型：GATEWAY,DIRECT_CONNECTION,SENSOR", required = true)
-    private DeviceTypeEnum deviceType;
-
-    /**
-     * TB的设备配置文件
-     */
-    private String tbProfileId;
-    @Valid
-    private transient DeviceProfileData profileData;
-    @ApiModelProperty(value = "关联规则链，默认关联根规则链", required = false)
-    private String defaultRuleChainId;
-    /**
-     * 告警通知配置
-     */
-    private AlarmProfileDTO alarmProfile;
-
-    /**默认消息队列*/
-    private String defaultQueueName;
-
-    /**设备配置图片*/
-    private String image;
-    /**是否默认设备配置*/
-    private boolean isDefault;
-    private String type;
-
-    public DeviceProfileDTO() {
-    }
-
-    public DeviceProfileDTO(UUID id, String name, Long time, String description, DeviceTransportType transportType, UUID defaultRuleChainId,boolean isDefault,String image,DeviceProfileType type,Object profileData) {
-        setId(id.toString());
-        setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.of("+8")));
-        this.name = name;
-        this.isDefault = isDefault;
-        this.image = image;
-        this.description = description;
-        this.type = type.name();
-        this.transportType = transportType.name();
-        this.defaultRuleChainId = Optional.ofNullable(defaultRuleChainId).map(chainId -> chainId.toString()).orElse(null);
-        this.profileData = JacksonUtil.convertValue(profileData, DeviceProfileData.class);
-
-    }
-    public DeviceProfileDTO(String name, TenantId tenantId, DeviceProfileId tbProfileId, DeviceTypeEnum deviceType) {
-        this.name = name;
-        this.tenantId =tenantId.getId().toString();
-        this.tbProfileId = tbProfileId.getId().toString();
-        this.deviceType = deviceType;
-    }
+  @NotEmpty(message = "设备配置名称不能为空或者空字符串", groups = AddGroup.class)
+  @ApiModelProperty(value = "产品(设备配置)名称")
+  private String name;
 
+  private String description;
+
+  /** TCP协议的解析脚本ID，由后端自己回填 */
+  private String scriptId;
+
+  @ApiModelProperty(value = "租户ID")
+  private String tenantId;
+
+  @NotEmpty(message = "传输协议不能为空或者空字符串", groups = AddGroup.class)
+  @ApiModelProperty(value = "传输协议", required = true)
+  private String transportType;
+
+  private String provisionType;
+
+  @NotNull(
+      message = "产品类型不能为空",
+      groups = {AddGroup.class})
+  @ApiModelProperty(value = "产品类型：GATEWAY,DIRECT_CONNECTION,SENSOR", required = true)
+  private DeviceTypeEnum deviceType;
+
+  /** TB的设备配置文件 */
+  private String tbProfileId;
+
+  @Valid private transient DeviceProfileData profileData;
+
+  @ApiModelProperty(value = "关联规则链，默认关联根规则链")
+  private String defaultRuleChainId;
+  /** 告警通知配置 */
+  private AlarmProfileDTO alarmProfile;
+
+  /** 默认消息队列 */
+  private String defaultQueueName;
+
+  /** 设备配置图片 */
+  private String image;
+  /** 是否默认设备配置 */
+  private boolean isDefault;
+
+  private String type;
+
+  @ApiModelProperty(value = "物模型")
+  private ThingsModelDTO thingsModel;
+
+  public DeviceProfileDTO() {}
+
+  public DeviceProfileDTO(
+      UUID id,
+      String name,
+      Long time,
+      String description,
+      DeviceTransportType transportType,
+      UUID defaultRuleChainId,
+      boolean isDefault,
+      String image,
+      DeviceProfileType type,
+      Object profileData) {
+    setId(id.toString());
+    setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.of("+8")));
+    this.name = name;
+    this.isDefault = isDefault;
+    this.image = image;
+    this.description = description;
+    this.type = type.name();
+    this.transportType = transportType.name();
+    this.defaultRuleChainId =
+        Optional.ofNullable(defaultRuleChainId).map(UUID::toString).orElse(null);
+    this.profileData = JacksonUtil.convertValue(profileData, DeviceProfileData.class);
+  }
+
+  public DeviceProfileDTO(
+      String name, TenantId tenantId, DeviceProfileId tbProfileId, DeviceTypeEnum deviceType) {
+    this.name = name;
+    this.tenantId = tenantId.getId().toString();
+    this.tbProfileId = tbProfileId.getId().toString();
+    this.deviceType = deviceType;
+  }
 }

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("事件模型")
+public class EventModelDTO extends BaseModelDTO {
+  @ApiModelProperty("时间类型：0 信息 1告警 2故障")
+  private Integer type;
+
+  @ApiModelProperty("输出参数")
+  private JsonNode outputData;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("服务模型")
+public class ServiceModelDTO extends BaseModelDTO {
+  @ApiModelProperty("调用方式：0 同步 1异步")
+  private Integer method;
+
+  @ApiModelProperty("输入参数")
+  private JsonNode inputData;
+
+  @ApiModelProperty("输出参数")
+  private JsonNode outputData;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("物模型")
+public class ThingsModelDTO extends TenantDTO {
+  @ApiModelProperty("功能类型")
+  @NotNull(
+      message = "功能类型不能为空",
+      groups = {AddGroup.class, UpdateGroup.class})
+  private FunctionTypeEnum functionType;
+
+  @ApiModelProperty("功能名称")
+  @NotEmpty(
+      message = "功能名称不能为空或空字符串",
+      groups = {AddGroup.class})
+  private String functionName;
+
+  @NotEmpty(
+      message = "功能标识不能为空或空字符串",
+      groups = {AddGroup.class})
+  @ApiModelProperty("功能标识")
+  private String identifier;
+
+  @ApiModelProperty("功能json")
+  @NotNull(
+      message = "功能json不能为空",
+      groups = {AddGroup.class})
+  private JsonNode functionJson;
+
+  @ApiModelProperty("设备配置ID")
+  @NotEmpty(
+      message = "设备配置ID不能为空或空字符串",
+      groups = {AddGroup.class, UpdateGroup.class})
+  private String deviceProfileId;
+
+  @ApiModelProperty("备注")
+  private String remark;
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum DataTypeEnum {
+    STRING,
+    BOOLEAN,
+    DOUBLE,
+    JSON
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum FunctionTypeEnum {
+  /** 属性 */
+  properties,
+  /** 事件 */
+  events,
+  /** 服务 */
+  services
+}

@@ -9,7 +9,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_CONVERT_CONFIG_TABLE_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_CONVERT_CONFIG_TABLE_NAME, autoResultMap = true)
 public class ConvertConfig extends TenantBaseEntity {
   private static final long serialVersionUID = -8354537796750197427L;
   private String name;

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(ModelConstants.Table.ADMIN_SETTING_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_ADMIN_SETTING_TABLE_NAME)
 public class AdminSetting extends BaseEntity {
 
   private static final long serialVersionUID = -881433375246560135L;

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_ALARM_CONTACT_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_ALARM_CONTACT_TABLE_NAME)
 public class AlarmContact extends TenantBaseEntity{
 
     private static final long serialVersionUID= -3982884827995610164L;

@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_ALARM_PROFILE_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_ALARM_PROFILE_TABLE_NAME)
 public class AlarmProfile extends TenantBaseEntity {
 
   private static final long serialVersionUID = -4922707705163155569L;

@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ActTypeEnum;
  * @author Administrator
  */
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_ACT, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_CONFIGURATION_ACT, autoResultMap = true)
 @Data
 public class ConfigurationAct extends ConfigurationBaseEntity {
     private static final long serialVersionUID = -4125982858197381343L;

@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_CENTER_NAME)
+@TableName(ModelConstants.Table.TK_CONFIGURATION_CENTER_NAME)
 @Data
 public class ConfigurationCenter extends TenantBaseEntity {
   private static final long serialVersionUID = -7825135358032541445L;

@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_CONTENT_NAME)
+@TableName(ModelConstants.Table.TK_CONFIGURATION_CONTENT_NAME)
 @Data
 public class ConfigurationContent extends TenantBaseEntity {
 

@@ -7,15 +7,12 @@ import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
-import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
-
-import java.util.List;
 
 /**
  * @author Administrator
  */
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_DATASOURCE, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_CONFIGURATION_DATASOURCE, autoResultMap = true)
 @Data
 public class ConfigurationDatasource extends ConfigurationBaseEntity {
     private static final long serialVersionUID = 2830393872646826226L;

@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum;
  * @author Administrator
  */
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_CONFIGURATION_EVENT, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_CONFIGURATION_EVENT, autoResultMap = true)
 @Data
 public class ConfigurationEvent extends ConfigurationBaseEntity {
     private static final long serialVersionUID = 4613503997176066996L;

@@ -11,7 +11,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_DATA_BOARD_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_DATA_BOARD_NAME, autoResultMap = true)
 @Data
 public class DataBoard extends TenantBaseEntity {
 

@@ -10,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_DATA_COMPONENT_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_DATA_COMPONENT_NAME, autoResultMap = true)
 public class DataComponent extends TenantBaseEntity {
 
   private static final long serialVersionUID = -1500982711916168023L;

@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_DEVICE_TYPE_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_DEVICE_TYPE_TABLE_NAME)
 public class DeviceType extends TenantBaseEntity {
 
     private static final long serialVersionUID = -3777232331298040322L;

@@ -3,7 +3,6 @@ package org.thingsboard.server.dao.yunteng.entities;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,14 +12,13 @@ import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
  * @Description 执行动作 @Author cxy @Date 2021/11/24 17:24
  */
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_DO_ACTION_TABLE_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_DO_ACTION_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class DoAction extends TenantBaseEntity {
 

@@ -6,21 +6,19 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
-import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
  * @Description 执行条件实体表 @Author cxy @Date 2021/11/24 17:16
  */
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_DO_CONDITION_TABLE_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_DO_CONDITION_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class DoCondition extends TenantBaseEntity {
     private static final long serialVersionUID = 2827674377416477646L;

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_FRP_INFO_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_FRP_INFO_NAME, autoResultMap = true)
 public class FrpInfo extends BaseEntity {
 
   private static final long serialVersionUID = 970621268444886639L;

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(value = ModelConstants.Table.MAIL_LOG_TABLE_NAME,autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_MAIL_LOG_TABLE_NAME,autoResultMap = true)
 public class MailLog extends BaseEntity {
   private static final long serialVersionUID = -8847842025838559296L;
 

@@ -11,7 +11,7 @@ import org.thingsboard.server.common.data.yunteng.enums.MenuTypeEnum;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.MENU_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_MENU_TABLE_NAME)
 public class Menu extends TenantBaseEntity {
 
   private static final long serialVersionUID = 6319718763792214142L;

@@ -10,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.MESSAGE_CONFIG_TABLE_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_MESSAGE_CONFIG_TABLE_NAME, autoResultMap = true)
 public class MessageConfig extends TenantBaseEntity {
 
   private static final long serialVersionUID = -3624943194108704138L;

@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.MESSAGE_TEMPLATE_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_MESSAGE_TEMPLATE_TABLE_NAME)
 public class MessageTemplate extends TenantBaseEntity {
 
   private static final long serialVersionUID = 6347635507829273091L;

@@ -9,7 +9,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_ORGANIZATION_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_ORGANIZATION_TABLE_NAME)
 public class Organization extends TenantBaseEntity {
 
   @TableField(updateStrategy = FieldStrategy.IGNORED)

@@ -9,7 +9,7 @@ import org.thingsboard.server.common.data.yunteng.enums.RateLimitType;
 import java.time.LocalTime;
 
 @Data
-@TableName(ModelConstants.Table.RATE_LIMIT_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_RATE_LIMIT_TABLE_NAME)
 public class RateLimiterEntity {
   private String id;
   private String path;

@@ -11,7 +11,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_REPORT_FORM_CONFIG_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_REPORT_FORM_CONFIG_NAME, autoResultMap = true)
 public class ReportFormConfig extends TenantBaseEntity {
 
   private static final long serialVersionUID = -1678849271872511953L;

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_REPORT_GENERATE_RECORD_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_REPORT_GENERATE_RECORD_NAME, autoResultMap = true)
 public class ReportGenerateRecord extends TenantBaseEntity {
 
   /** 报表配置名称 */

@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(ModelConstants.Table.ROLE_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_ROLE_TABLE_NAME)
 public class Role extends TenantBaseEntity {
 
   private static final long serialVersionUID = 3915852360063998830L;

@@ -6,7 +6,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 /** @Description 场景联动实体表 @Author cxy @Date 2021/11/24 16:40 */
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_SCENE_LINKAGE_TABLE_NAME)
+@TableName(value = ModelConstants.Table.TK_SCENE_LINKAGE_TABLE_NAME)
 @EqualsAndHashCode(callSuper = true)
 public class SceneLinkage extends TenantBaseEntity {
 

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(value = ModelConstants.Table.SMS_LOG_TABLE_NAME,autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_SMS_LOG_TABLE_NAME,autoResultMap = true)
 public class SmsLog extends BaseEntity {
 
   private static final long serialVersionUID = 2778820322396894328L;

@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.DEPT_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_DEPT_TABLE_NAME)
 public class SysDept extends TenantBaseEntity {
 
 

@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(ModelConstants.Table.DICT_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_DICT_TABLE_NAME)
 public class SysDict extends TenantBaseEntity {
 
   private static final long serialVersionUID = -5381101569947327544L;

@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @RequiredArgsConstructor
-@TableName(ModelConstants.Table.DICT_ITEM_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_DICT_ITEM_TABLE_NAME)
 public class SysDictItem extends TenantBaseEntity {
 
   private static final long serialVersionUID = 9177617160310722864L;

@@ -9,7 +9,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 /** 定时任务调度表 sys_job */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.JOB_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_JOB_TABLE_NAME)
 public class SysJob extends TenantBaseEntity {
 
   private static final long serialVersionUID = -5277603237529335023L;

@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 定时任务调度日志表 sys_job_log
@@ -14,7 +13,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.JOB_LOG_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_JOB_LOG_TABLE_NAME)
 public class SysJobLog extends BaseEntity {
 
   private static final long serialVersionUID = 1739849551616104371L;

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(ModelConstants.Table.TENANT_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_TENANT_TABLE_NAME)
 public class Tenant extends AuditRelatedEntity {
 
   private static final long serialVersionUID = 4848421848961008112L;

@@ -9,7 +9,7 @@ import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(ModelConstants.Table.TENANT_MENU_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_TENANT_MENU_TABLE_NAME)
 public class TenantMenu implements Serializable {
   private static final long serialVersionUID = -8775371485677702427L;
   /** 菜单ID */

@@ -9,7 +9,7 @@ import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(ModelConstants.Table.TENANT_ROLE_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_TENANT_ROLE_TABLE_NAME)
 public class TenantRole implements Serializable {
 
   private static final long serialVersionUID = 7332631758506821892L;

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.Table.TK_THING_MODEL, autoResultMap = true)
+public class ThingsModelEntity extends TenantBaseEntity {
+
+  private static final long serialVersionUID = 2265006809255944302L;
+
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private FunctionTypeEnum functionType;
+
+  private String functionName;
+  private String identifier;
+
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode functionJson;
+
+  private String deviceProfileId;
+  private String remark;
+}

@@ -6,21 +6,19 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
-import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
  * @Description 触发器实体表 @Author cxy @Date 2021/11/24 17:06
  */
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_TRIGGER_TABLE_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_TRIGGER_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class Trigger extends TenantBaseEntity {
 

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 /** user是所有可登录系统用户 */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(ModelConstants.Table.USER_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_USER_TABLE_NAME)
 public class User extends TenantBaseEntity {
   private static final long serialVersionUID = 834982016421849497L;
   private String username;

@@ -9,7 +9,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName(ModelConstants.Table.IOTFS_USER_ORGANIZATION_MAPPING_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_USER_ORGANIZATION_MAPPING_TABLE_NAME)
 public class UserOrganizationMapping {
   private String userId;
   private String organizationId;

@@ -9,7 +9,7 @@ import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(ModelConstants.Table.USER_ROLE_TABLE_NAME)
+@TableName(ModelConstants.Table.SYS_USER_ROLE_TABLE_NAME)
 public class UserRole implements Serializable {
 
   private static final long serialVersionUID = -1018514294019250455L;

@@ -12,10 +12,10 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_DEVICE_TABLE_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_DEVICE_TABLE_NAME, autoResultMap = true)
 public class YtDevice extends TenantBaseEntity {
     private String name;
-
+    private String alias;
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode deviceInfo;
     private String profileId;

@@ -2,8 +2,6 @@ package org.thingsboard.server.dao.yunteng.entities;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
@@ -12,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.IOTFS_DEVICE_PROFILE_TABLE_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_DEVICE_PROFILE_TABLE_NAME, autoResultMap = true)
 public class YtDeviceProfileEntity extends TenantBaseEntity {
     private String name;
 

@@ -2,17 +2,14 @@ package org.thingsboard.server.dao.yunteng.entities;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
 
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_DEVICE_SCRIPT_TABLE_NAME, autoResultMap = true)
+@TableName(value = ModelConstants.Table.TK_DEVICE_SCRIPT_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class YtDeviceScriptEntity extends TenantBaseEntity {
   private String name;

@@ -10,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_OPINION_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_OPINION_TABLE_NAME)
 public class YtOpinionEntity extends TenantBaseEntity {
 
     private static final long serialVersionUID = 7339240901373153647L;

 package org.thingsboard.server.dao.yunteng.entities;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
 
-import javax.validation.constraints.NotEmpty;
-
 /**
  * @author Administrator
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_THIRD_USER_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_THIRD_USER_TABLE_NAME)
 public class YtThirdUserEntity extends BaseEntity {
 
     private ThirdPlatformEnum platformName;

 package org.thingsboard.server.dao.yunteng.entities;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
-import javax.validation.constraints.NotEmpty;
-
 /**
  * @author Administrator
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_VIDEO_STREAM_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_VIDEO_STREAM_TABLE_NAME)
 public class YtVideoEntity extends TenantBaseEntity {
 
 

@@ -10,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(ModelConstants.Table.IOTFS_VIDEO_PLATFORM_TABLE_NAME)
+@TableName(ModelConstants.Table.TK_VIDEO_PLATFORM_TABLE_NAME)
 public class YtVideoPlatformEntity extends TenantBaseEntity {
 
 

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+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.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.yunteng.entities.ThingsModelEntity;
+import org.thingsboard.server.dao.yunteng.mapper.ThingsModelMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
+import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class ThingsModelServiceImpl
+    extends AbstractBaseService<ThingsModelMapper, ThingsModelEntity>
+    implements ThingsModelService {
+  private final YtDeviceProfileService ytDeviceProfileService;
+
+  @Override
+  public YtPageData<ThingsModelDTO> page(Map<String, Object> queryMap, String tenantId) {
+    String nameOrIdentifier =
+        null != queryMap.get("nameOrIdentifier") ? (String) queryMap.get("nameOrIdentifier") : null;
+    IPage<ThingsModelEntity> iPage =
+        baseMapper.selectPage(
+            getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
+            new LambdaQueryWrapper<ThingsModelEntity>()
+                .eq(ThingsModelEntity::getTenantId, tenantId)
+                .like(
+                    StringUtils.isNotEmpty(nameOrIdentifier),
+                    ThingsModelEntity::getFunctionName,
+                    nameOrIdentifier)
+                .or()
+                .like(
+                    StringUtils.isNotEmpty(nameOrIdentifier),
+                    ThingsModelEntity::getIdentifier,
+                    nameOrIdentifier));
+    return getPageData(iPage, ThingsModelDTO.class);
+  }
+
+  @Override
+  @Transactional
+  public ThingsModelDTO saveOrUpdate(ThingsModelDTO thingsModelDTO) {
+    String thingsModelId = thingsModelDTO.getId();
+    boolean isAdd = StringUtils.isEmpty(thingsModelId);
+    if (checkIdentifier(
+        thingsModelDTO.getDeviceProfileId(),
+        thingsModelDTO.getIdentifier(),
+        isAdd,
+        thingsModelId)) {
+      throw new YtDataValidationException(ErrorMessage.DUPLICATE_IDENTIFIERS_EXIST.getMessage());
+    }
+    ThingsModelEntity entity = thingsModelDTO.getEntity(ThingsModelEntity.class);
+    if (isAdd) {
+      baseMapper.insert(entity);
+      thingsModelDTO.setId(entity.getId());
+    } else {
+      ThingsModelEntity result =
+          baseMapper.selectOne(
+              new LambdaQueryWrapper<ThingsModelEntity>()
+                  .eq(ThingsModelEntity::getTenantId, thingsModelDTO.getTenantId())
+                  .eq(ThingsModelEntity::getId, thingsModelDTO.getId()));
+      if (null == result) {
+        throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+      baseMapper.updateById(entity);
+    }
+    return thingsModelDTO;
+  }
+
+  @Override
+  public ThingsModelDTO get(String id, String tenantId) {
+    ThingsModelEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<ThingsModelEntity>()
+                .eq(ThingsModelEntity::getTenantId, tenantId)
+                .eq(ThingsModelEntity::getId, id));
+    return Optional.ofNullable(entity).map(obj -> obj.getDTO(ThingsModelDTO.class)).orElse(null);
+  }
+
+  @Override
+  @Transactional
+  public boolean delete(DeleteDTO dto) {
+    int result =
+        baseMapper.delete(
+            new LambdaQueryWrapper<ThingsModelEntity>()
+                .eq(ThingsModelEntity::getTenantId, dto.getTenantId())
+                .in(ThingsModelEntity::getId, dto.getIds()));
+    if (result > FastIotConstants.MagicNumber.ZERO && result != dto.getIds().size()) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return result > FastIotConstants.MagicNumber.ZERO;
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteByDeviceProfileId(String tenantId, String deviceProfileId) {
+    int result =
+        baseMapper.delete(
+            new LambdaQueryWrapper<ThingsModelEntity>()
+                .eq(ThingsModelEntity::getTenantId, tenantId)
+                .eq(ThingsModelEntity::getDeviceProfileId, deviceProfileId));
+    if (result == FastIotConstants.MagicNumber.ZERO) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return true;
+  }
+
+  @Override
+  public List<ThingsModelDTO> selectByDeviceProfileId(
+      FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId) {
+    List<ThingsModelEntity> entityList =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<ThingsModelEntity>()
+                .eq(ThingsModelEntity::getTenantId, tenantId)
+                .eq(ThingsModelEntity::getDeviceProfileId, deviceProfileId)
+                .eq(ThingsModelEntity::getFunctionType, typeEnum));
+    if (entityList.isEmpty()) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return entityList.stream()
+        .map(obj -> obj.getDTO(ThingsModelDTO.class))
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public JsonNode getTingsModelJson(
+      FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId) {
+    JsonNode jsonNode = null;
+    DeviceProfileDTO deviceProfileDTO =
+        ytDeviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
+
+    List<ThingsModelDTO> thingsModelDTOS =
+        selectByDeviceProfileId(typeEnum, tenantId, deviceProfileId);
+    if (deviceProfileDTO.getDeviceType().equals(DeviceTypeEnum.SENSOR)) {
+      if(typeEnum.equals(FunctionTypeEnum.properties)){
+        jsonNode = getSensorTSL(thingsModelDTOS);
+      }else if(typeEnum.equals(FunctionTypeEnum.services)){
+
+      }
+    }
+    return jsonNode;
+  }
+
+  /**
+   * 获取网关子设备的物模型TSL
+   *
+   * @param thingsModelDTOS
+   * @return
+   */
+  private JsonNode getSensorTSL(List<ThingsModelDTO> thingsModelDTOS) {
+    Map<String, List<ObjectNode>> attributeMap = new HashMap<>();
+    List<ObjectNode> list = new ArrayList<>();
+    for (ThingsModelDTO model : thingsModelDTOS) {
+      ObjectNode objectNode = JacksonUtil.newObjectNode();
+      objectNode.put(model.getIdentifier(), "value");
+      list.add(objectNode);
+    }
+    attributeMap.put("网关子设备名称", list);
+    return JacksonUtil.convertValue(attributeMap, JsonNode.class);
+  }
+
+  private boolean checkIdentifier(
+      String deviceProfileId, String identifier, boolean isAdd, String thingsModelId) {
+    ThingsModelEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<ThingsModelEntity>()
+                .eq(ThingsModelEntity::getDeviceProfileId, deviceProfileId)
+                .eq(ThingsModelEntity::getIdentifier, identifier));
+    return Optional.ofNullable(entity)
+        .map(
+            obj -> {
+              boolean result = false;
+              if (isAdd) {
+                result = true;
+              } else if (!entity.getId().equals(thingsModelId)) {
+                result = true;
+              }
+              return result;
+            })
+        .orElse(false);
+  }
+}

@@ -46,7 +46,7 @@ public class YtDeviceProfileServiceImpl
   private final YtJpaDeviceProfileDao deviceProfileDao;
 
   @Override
-  public boolean validateFormdata(DeviceProfileDTO ytDeviceProfileDTO) {
+  public boolean validateFormData(DeviceProfileDTO ytDeviceProfileDTO) {
     TenantId tenantId = TenantId.fromUUID(UUID.fromString(ytDeviceProfileDTO.getTenantId()));
     if (StringUtils.isBlank(ytDeviceProfileDTO.getId())) {
       // 判断数据库是否已存在名字相同的设备配置
@@ -77,6 +77,17 @@ public class YtDeviceProfileServiceImpl
   }
 
   @Override
+  public DeviceProfileDTO findByTbDeviceProfileId(String tenantId, String tbProfileId) {
+    YtDeviceProfileEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<YtDeviceProfileEntity>()
+                .eq(YtDeviceProfileEntity::getTenantId, tenantId)
+                .eq(YtDeviceProfileEntity::getTbProfileId, tbProfileId));
+
+    return Optional.ofNullable(entity).map(obj -> obj.getDTO(DeviceProfileDTO.class)).orElse(null);
+  }
+
+  @Override
   @Transactional
   public DeviceProfileDTO insertOrUpdate(DeviceProfileDTO deviceDTO) {
     if (StringUtils.isBlank(deviceDTO.getId())) {
@@ -169,7 +180,7 @@ public class YtDeviceProfileServiceImpl
 
   @Override
   public List<DeviceProfileDTO> findDeviceProfile(String tenantId, String scriptId) {
-    List<DeviceProfileDTO> results =  baseMapper.profileByScriptId(tenantId,scriptId);
+    List<DeviceProfileDTO> results = baseMapper.profileByScriptId(tenantId, scriptId);
     return results;
   }
 }

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -18,11 +19,9 @@ 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.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
-import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
@@ -30,6 +29,7 @@ import org.thingsboard.server.dao.device.DeviceProfileDao;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
 import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
 
 import java.time.LocalDateTime;
@@ -49,6 +49,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   private final TriggerMapper triggerMapper;
   private final DoConditionMapper conditionMapper;
   private final DoActionMapper actionMapper;
+  private final ThingsModelService thingsModelService;
 
   @Override
   @Transactional
@@ -88,9 +89,9 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   }
 
   @Override
-  public void validateFormdata(String currentTenantId, DeviceDTO deviceDTO) {
+  public void validateFormData(String currentTenantId, DeviceDTO deviceDTO) {
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
-    String deviceTenantId = deviceDTO.getTenantId();
+    String deviceTenantId;
     if (StringUtils.isBlank(deviceDTO.getName())) {
       throw new YtDataValidationException("设备名称不能为空");
     }
@@ -100,7 +101,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     }
 
     // 验证设备名称是否已经存在 如果此处直接使用deviceDTO 将有误
-    if (deviceNameUsed(currentTenantId, deviceDTO.getName(),deviceDTO.getId())) {
+    if (deviceNameUsed(currentTenantId, deviceDTO.getName(), deviceDTO.getId())) {
       throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
     }
     if (insert) {
@@ -141,7 +142,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
    * @return
    */
   private boolean sceneNotUsed(String tenantId, String tbDeviceId, String organizationId) {
-    boolean result = true;
+    boolean result = false;
     /** 激活的场景联动使用了设备，例如：触发器、自行条件、动作等。 */
     List<SceneLinkage> scenes =
         sceneLinkageMapper.selectList(
@@ -153,55 +154,56 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
                     SceneLinkage::getOrganizationId,
                     organizationId));
     if (scenes == null || scenes.isEmpty()) {
-      return true;
-    }
-    Set<String> sceneNames = new HashSet<>();
-    for (SceneLinkage scene : scenes) {
-      List<Trigger> triggers =
-          triggerMapper.selectList(
-              new QueryWrapper<Trigger>()
-                  .lambda()
-                  .eq(Trigger::getSceneLinkageId, scene.getId())
-                  .eq(
-                      scene.getStatus() == FastIotConstants.StateValue.DISABLE,
-                      Trigger::getTriggerType,
-                      ScopeEnum.PART)
-                  .like(Trigger::getEntityId, tbDeviceId));
-      if (triggers != null && triggers.size() > 0) {
-        sceneNames.add(scene.getName());
-      }
-      List<DoCondition> conditions =
-          conditionMapper.selectList(
-              new QueryWrapper<DoCondition>()
-                  .lambda()
-                  .eq(DoCondition::getSceneLinkageId, scene.getId())
-                  .eq(
-                      scene.getStatus() == FastIotConstants.StateValue.DISABLE,
-                      DoCondition::getEntityType,
-                      ScopeEnum.PART)
-                  .like(DoCondition::getEntityId, tbDeviceId));
-      if (conditions != null && conditions.size() > 0) {
-        sceneNames.add(scene.getName());
+      result = true;
+    } else {
+
+      Set<String> sceneNames = new HashSet<>();
+      for (SceneLinkage scene : scenes) {
+        List<Trigger> triggers =
+            triggerMapper.selectList(
+                new QueryWrapper<Trigger>()
+                    .lambda()
+                    .eq(Trigger::getSceneLinkageId, scene.getId())
+                    .eq(
+                        scene.getStatus() == FastIotConstants.StateValue.DISABLE,
+                        Trigger::getTriggerType,
+                        ScopeEnum.PART)
+                    .like(Trigger::getEntityId, tbDeviceId));
+        if (triggers != null && triggers.size() > 0) {
+          sceneNames.add(scene.getName());
+        }
+        List<DoCondition> conditions =
+            conditionMapper.selectList(
+                new QueryWrapper<DoCondition>()
+                    .lambda()
+                    .eq(DoCondition::getSceneLinkageId, scene.getId())
+                    .eq(
+                        scene.getStatus() == FastIotConstants.StateValue.DISABLE,
+                        DoCondition::getEntityType,
+                        ScopeEnum.PART)
+                    .like(DoCondition::getEntityId, tbDeviceId));
+        if (conditions != null && conditions.size() > 0) {
+          sceneNames.add(scene.getName());
+        }
+        List<DoAction> actions =
+            actionMapper.selectList(
+                new QueryWrapper<DoAction>()
+                    .lambda()
+                    .eq(DoAction::getSceneLinkageId, scene.getId())
+                    .eq(
+                        scene.getStatus() == FastIotConstants.StateValue.DISABLE,
+                        DoAction::getEntityType,
+                        ScopeEnum.PART)
+                    .like(DoAction::getDeviceId, tbDeviceId));
+        if (actions != null && actions.size() > 0) {
+          sceneNames.add(scene.getName());
+        }
       }
-      List<DoAction> actions =
-          actionMapper.selectList(
-              new QueryWrapper<DoAction>()
-                  .lambda()
-                  .eq(DoAction::getSceneLinkageId, scene.getId())
-                  .eq(
-                      scene.getStatus() == FastIotConstants.StateValue.DISABLE,
-                      DoAction::getEntityType,
-                      ScopeEnum.PART)
-                  .like(DoAction::getDeviceId, tbDeviceId));
-      if (actions != null && actions.size() > 0) {
-        sceneNames.add(scene.getName());
+      if (sceneNames.size() > 0) {
+        throw new YtDataValidationException(
+            String.format(ErrorMessage.DEVICE_USED_SCENE_REACT.getMessage(), sceneNames));
       }
     }
-    if (sceneNames.size() > 0) {
-      throw new YtDataValidationException(
-          String.format(ErrorMessage.DEVICE_USED_SCENE_REACT.getMessage(), sceneNames));
-    }
-
     return result;
   }
 
@@ -243,16 +245,16 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
 
   @Override
   public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-      DeviceTypeEnum deviceType, String tenantId, String organizationId,String deviceLabel) {
+      DeviceTypeEnum deviceType, String tenantId, String organizationId, String deviceLabel) {
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
-    if(orgIds.isEmpty()){
+    if (orgIds.isEmpty()) {
       throw new YtDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
     }
     return ReflectUtils.sourceToTarget(
         baseMapper.selectList(
             new LambdaQueryWrapper<YtDevice>()
-                    .eq(deviceType != null,YtDevice::getDeviceType, deviceType)
-                    .eq(deviceLabel != null,YtDevice::getLabel, deviceLabel)
+                .eq(deviceType != null, YtDevice::getDeviceType, deviceType)
+                .eq(deviceLabel != null, YtDevice::getLabel, deviceLabel)
                 .in(YtDevice::getOrganizationId, orgIds)),
         DeviceDTO.class);
   }
@@ -262,7 +264,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     if (StringUtils.isEmpty(tenantId) || StringUtils.isEmpty(deviceId)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    return baseMapper.selectDetail(tenantId,deviceId);
+    return baseMapper.selectDetail(tenantId, deviceId);
   }
 
   @Override
@@ -333,22 +335,18 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
    *
    * @param tenantId 租户ID
    * @param organizationId 组织ID
-   * @return
    */
   @NotNull
   private List<String> organizationAllIds(String tenantId, String organizationId) {
     List<String> organizationIds = new ArrayList<>();
-    if(!StringUtils.isEmpty(organizationId)){
+    if (!StringUtils.isEmpty(organizationId)) {
       organizationIds.add(organizationId);
     }
     // 查询该组织的所有子类
     List<OrganizationDTO> organizationDTOS =
         ytOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
     List<String> queryOrganizationIds = new ArrayList<>();
-    organizationDTOS.forEach(
-        item -> {
-          queryOrganizationIds.add(item.getId());
-        });
+    organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
     return queryOrganizationIds;
   }
 
@@ -361,16 +359,16 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   }
 
   @Override
-  public boolean deviceNameUsed(String tenantId, String deviceName,String deviceId) {
+  public boolean deviceNameUsed(String tenantId, String deviceName, String deviceId) {
     List<YtDevice> deviceList =
-        baseMapper.selectList(new QueryWrapper<YtDevice>()
+        baseMapper.selectList(
+            new QueryWrapper<YtDevice>()
                 .lambda()
                 .eq(true, YtDevice::getTenantId, tenantId)
-                .eq(YtDevice::getName,deviceName));
-    for(YtDevice dev: deviceList){
-      if(deviceName.equals(dev.getName())
-              && (StringUtils.isEmpty(deviceId) || !deviceId.equals(dev.getId()))
-      ){
+                .eq(YtDevice::getName, deviceName));
+    for (YtDevice dev : deviceList) {
+      if (deviceName.equals(dev.getName())
+          && (StringUtils.isEmpty(deviceId) || !deviceId.equals(dev.getId()))) {
         return true;
       }
     }
@@ -423,17 +421,14 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     }
     Set<String> usedIds = new HashSet<>();
     List<String> scenFilterIds =
-        scenes.get().stream().map(i -> i.getId()).collect(Collectors.toList());
+        scenes.get().stream().map(BaseEntity::getId).collect(Collectors.toList());
     LambdaQueryWrapper<Trigger> triggerFilter =
         new QueryWrapper<Trigger>()
             .lambda()
             .in(scenFilterIds.size() > 0, Trigger::getSceneLinkageId, scenFilterIds)
             .like(Trigger::getEntityId, tbDeviceId);
     List<Trigger> triggers = triggerMapper.selectList(triggerFilter);
-    triggers.forEach(
-        item -> {
-          usedIds.add(item.getSceneLinkageId());
-        });
+    triggers.forEach(item -> usedIds.add(item.getSceneLinkageId()));
 
     LambdaQueryWrapper<DoCondition> conditionFilter =
         new QueryWrapper<DoCondition>()
@@ -441,10 +436,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
             .in(scenFilterIds.size() > 0, DoCondition::getSceneLinkageId, scenFilterIds)
             .eq(DoCondition::getEntityId, tbDeviceId);
     List<DoCondition> doConditions = conditionMapper.selectList(conditionFilter);
-    doConditions.forEach(
-        item -> {
-          usedIds.add(item.getSceneLinkageId());
-        });
+    doConditions.forEach(item -> usedIds.add(item.getSceneLinkageId()));
 
     LambdaQueryWrapper<DoAction> actionFilter =
         new QueryWrapper<DoAction>()
@@ -452,10 +444,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
             .in(scenFilterIds.size() > 0, DoAction::getSceneLinkageId, scenFilterIds)
             .eq(DoAction::getDeviceId, tbDeviceId);
     List<DoAction> doActions = actionMapper.selectList(actionFilter);
-    doActions.forEach(
-        item -> {
-          usedIds.add(item.getSceneLinkageId());
-        });
+    doActions.forEach(item -> usedIds.add(item.getSceneLinkageId()));
 
     if (usedIds.isEmpty()) {
       return "";
@@ -463,7 +452,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     StringBuilder result = new StringBuilder();
     for (SceneLinkage item : scenes.get()) {
       if (usedIds.contains(item.getId())) {
-        result.append("," + item.getName());
+        result.append(",").append(item.getName());
       }
     }
     return String.format(ErrorMessage.DEVICE_USED_SCENE_REACT.getMessage(), result.substring(1));
@@ -473,30 +462,26 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   public List<SelectItemDTO> findMasterDevices(
       String tenantId, String customerId, String organizationId) {
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
-    List<SelectItemDTO> result = baseMapper.masterDevices(customerId, tenantId, orgIds);
-    return result;
+    return baseMapper.masterDevices(customerId, tenantId, orgIds);
   }
 
   @Override
   public List<SelectItemDTO> findSlaveDevices(
       String masterId, String tenantId, String customerId, String organizationId) {
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
-    List<SelectItemDTO> result = baseMapper.slaveDevices(customerId, tenantId, orgIds, masterId);
-    return result;
+    return baseMapper.slaveDevices(customerId, tenantId, orgIds, masterId);
   }
 
-
   @Override
   public DeviceDTO findSlaveDevice(String tenantId, String masterId, String deviceCode) {
-    return baseMapper.slaveDevice(tenantId,masterId,deviceCode);
+    return baseMapper.slaveDevice(tenantId, masterId, deviceCode);
   }
 
   @Override
   public List<String> findDeviceKeys(
       String tenantId, String customerId, String organizationId, List<String> deviceIds) {
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
-    List<String> result = baseMapper.findDeviceKeys(tenantId, customerId, orgIds, deviceIds);
-    return result;
+    return baseMapper.findDeviceKeys(tenantId, customerId, orgIds, deviceIds);
   }
 
   @Override
@@ -537,8 +522,43 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
             new LambdaQueryWrapper<YtDevice>()
                 .eq(YtDevice::getTbDeviceId, tbDeviceId)
                 .eq(YtDevice::getTenantId, tenantId));
-    return Optional.ofNullable(device).map(obj -> obj.getDTO(DeviceDTO.class)).orElseThrow(()->{
-      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-    });
+    return Optional.ofNullable(device)
+        .map(obj -> obj.getDTO(DeviceDTO.class))
+        .orElseThrow(
+            () -> {
+              throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+            });
+  }
+
+  @Override
+  public JsonNode getDeviceAttributes(String tbProfileId,String profileId, String id, String tenantId) {
+    return getDevice(tenantId, id)
+        .map(
+            obj -> {
+              if (obj.getProfileId().equals(tbProfileId)) {
+                JsonNode jsonNode = null;
+                List<ThingsModelDTO> thingsModel =
+                    thingsModelService.selectByDeviceProfileId(
+                        FunctionTypeEnum.properties, tenantId, profileId);
+                if (!thingsModel.isEmpty()) {
+                  List<Map<String, Object>> attributes = new ArrayList<>();
+                  for (ThingsModelDTO dto : thingsModel) {
+                    Map<String, Object> attribute = new HashMap<>();
+                    attribute.put("name", dto.getFunctionName());
+                    attribute.put("identifier", dto.getIdentifier());
+                    attribute.put("detail", dto.getFunctionJson());
+                    attributes.add(attribute);
+                  }
+                  jsonNode = JacksonUtil.convertValue(attributes, JsonNode.class);
+                }
+                return jsonNode;
+              } else {
+                throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+              }
+            })
+        .orElseThrow(
+            () -> {
+              throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+            });
   }
 }

@@ -11,11 +11,10 @@ import org.thingsboard.server.dao.util.mapping.JsonBinaryType;
 import org.thingsboard.server.dao.util.mapping.JsonStringType;
 
 import javax.persistence.*;
-import java.util.UUID;
 
 @Data
 @Entity
-@Table(name = ModelConstants.Table.IOTFS_DEVICE_TABLE_NAME)
+@Table(name = ModelConstants.Table.TK_DEVICE_TABLE_NAME)
 @TypeDefs({
         @TypeDef(name = "json", typeClass = JsonStringType.class),
         @TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.ThingsModelEntity;
+
+@Mapper
+public interface ThingsModelMapper extends BaseMapper<ThingsModelEntity> {}

+package org.thingsboard.server.dao.yunteng.service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ThingsModelService {
+  YtPageData<ThingsModelDTO> page(Map<String, Object> queryMap, String tenantId);
+
+  ThingsModelDTO saveOrUpdate(ThingsModelDTO thingsModelDTO);
+
+  ThingsModelDTO get(String id, String tenantId);
+
+  boolean delete(DeleteDTO dto);
+
+  boolean deleteByDeviceProfileId(String tenantId, String deviceProfileId);
+
+  List<ThingsModelDTO> selectByDeviceProfileId(
+      FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
+
+  JsonNode getTingsModelJson(FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
+}

@@ -27,16 +27,22 @@ public interface YtDeviceProfileService {
     /**
      * 验证表单数据有效性
      *
-     * @param ytDeviceProfileDTO
-     * @return
      */
-    boolean validateFormdata(DeviceProfileDTO ytDeviceProfileDTO);
+    boolean validateFormData(DeviceProfileDTO ytDeviceProfileDTO);
 
     /**
-     * 根据设备配置ID或者设备配置信息
+     * 根据设备配置ID获取设备配置信息
      * @param tenantId 租户ID
      * @param id 设备配置ID
      * @return 设备配置信息
      */
     DeviceProfileDTO findDeviceProfileById(String tenantId, String id);
+
+    /**
+     * *根据tb设备ID获取设备配置信息
+     * @param tenantId 租户ID
+     * @param tbProfileId tb设备配置ID
+     * @return 设备配置信息
+     */
+    DeviceProfileDTO findByTbDeviceProfileId(String tenantId,String tbProfileId);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
@@ -29,7 +30,7 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      *
      * @param ytDevice
      */
-    void validateFormdata(String currentTenantId, DeviceDTO ytDevice);
+    void validateFormData(String currentTenantId, DeviceDTO ytDevice);
 
     /**
      * 查询所有的设备信息
@@ -162,10 +163,20 @@ public interface YtDeviceService extends BaseService<YtDevice> {
 
     /**
      * 通过tb设备ID获取平台设备信息
-     * @param tenantId
-     * @param tbDeviceId
-     * @return
+     * @param tenantId 租户ID
+     * @param tbDeviceId tb设备ID
+     * @return 设备信息
      */
     DeviceDTO getSubsetDeviceByTbDeviceId(String tenantId,String tbDeviceId);
 
+    /**
+     * 通过设备ID 设备配置ID获取属性
+     * @param tbProfileId tb设备配置ID
+     * @param profileId 设备配置ID
+     * @param id 设备ID
+     * @param tenantId 租户ID
+     * @return 属性信息
+     */
+    JsonNode getDeviceAttributes(String tbProfileId,String profileId,String id,String tenantId);
+
 }

@@ -29,8 +29,8 @@
     <select id="getAlarmPage" resultMap="alarmContactMap">
         SELECT
         <include refid="columns"/>
-        FROM iotfs_alarm_contact a
-        LEFT JOIN iotfs_organization io ON io.id = a.organization_id
+        FROM tk_alarm_contact a
+        LEFT JOIN tk_organization io ON io.id = a.organization_id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND a.tenant_id = #{queryMap.tenantId}

@@ -24,8 +24,8 @@
     <select id="getAlarmProfilePage" resultMap="alarmProfileMap">
         SELECT
         <include refid="columns"/>
-        FROM iotfs_alarm_profile a
-        LEFT JOIN iotfs_organization io ON io.id = a.organization_id
+        FROM tk_alarm_profile a
+        LEFT JOIN tk_organization io ON io.id = a.organization_id
         <where>
             a.tenant_id = #{tenantId}
             <if test="queryMap.name !=null and queryMap.name !=''">

@@ -35,8 +35,8 @@
     <select id="getConfigurationCenterPage" resultMap="configurationCenterMap">
         SELECT
         <include refid="columns"/>
-        FROM iotfs_configuration_center a
-        LEFT JOIN iotfs_organization io ON io.id = a.organization_id
+        FROM tk_configuration_center a
+        LEFT JOIN tk_organization io ON io.id = a.organization_id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND a.tenant_id = #{queryMap.tenantId}
@@ -57,8 +57,8 @@
     </select>
 
     <select id="getConfigurationInfoById" resultMap="configurationInfoMap">
-        SELECT icc.id,icc.name,icc.platform,icc.thumbnail,icct.id AS content_id,icct.content FROM iotfs_configuration_center icc LEFT JOIN
-        iotfs_configuration_content icct ON icc.id = icct.configuration_id
+        SELECT icc.id,icc.name,icc.platform,icc.thumbnail,icct.id AS content_id,icct.content FROM tk_configuration_center icc LEFT JOIN
+        tk_configuration_content icct ON icc.id = icct.configuration_id
         WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
     </select>
 </mapper>

@@ -18,7 +18,7 @@
         <result property="remark" column="remark"/>
     </resultMap>
     <update id="updateConvertStatusByIds">
-        UPDATE iotfs_convert_config
+        UPDATE tk_convert_config
         SET status =#{status}
         <where>
             tenant_id = #{tenantId}

@@ -14,7 +14,7 @@
         <result property="remark" column="remark"/>
     </resultMap>
     <update id="updateDataBoardComponentNum">
-        UPDATE iotfs_data_board
+        UPDATE tk_data_board
         SET component_num =#{count}
         <where>
             id = #{id}

@@ -10,6 +10,7 @@
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.DeviceDTO" id="deviceMap">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
+        <result property="alias" column="alias"/>
         <result property="deviceInfo" column="device_info"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="profileId" column="profile_id"/>
@@ -62,7 +63,7 @@
 
     <sql id="basicColumns">
         ifd.id
-        ,ifd.sn,ifd.brand,ifd.name,ifd.device_info,ifd.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.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.updater,ifd.organization_id,ifd.alarm_status
     </sql>
@@ -79,9 +80,9 @@
     <select id="getDevicePage" resultMap="deviceMap">
         SELECT
         <include refid="pageColumns"/>,d.customer_id::TEXT AS customer_id,cus.title AS cusotomer_name
-        FROM iotfs_device ifd
+        FROM tk_device ifd
         LEFT JOIN device_profile ifdp ON ifd.profile_id = ifdp.id::TEXT
-        LEFT JOIN iotfs_organization io ON io.id = ifd.organization_id
+        LEFT JOIN tk_organization io ON io.id = ifd.organization_id
         LEFT JOIN attribute_kv a ON ifd.tb_device_id = a.entity_id::TEXT AND a.entity_type ='DEVICE' AND a.attribute_key='active'
         LEFT JOIN attribute_kv b ON ifd.tb_device_id = b.entity_id::TEXT AND b.entity_type ='DEVICE' AND b.attribute_key='lastActivityTime'
         LEFT JOIN attribute_kv c ON ifd.tb_device_id = c.entity_id::TEXT AND c.entity_type ='DEVICE' AND c.attribute_key='lastDisconnectTime'
@@ -131,15 +132,15 @@
     <select id="selectDetail" resultMap="deviceMap">
         SELECT
         <include refid="detailColumns"/>
-        FROM iotfs_device ifd
+        FROM tk_device ifd
         LEFT JOIN device_profile ifdp ON ifd.profile_id = CAST (ifdp.id AS VARCHAR)
-        LEFT JOIN iotfs_organization io ON io.id = ifd.organization_id
+        LEFT JOIN tk_organization io ON io.id = ifd.organization_id
         LEFT JOIN attribute_kv a ON ifd.tb_device_id = a.entity_id::TEXT AND a.entity_type ='DEVICE' AND a.attribute_key='active'
         LEFT JOIN attribute_kv b ON ifd.tb_device_id = b.entity_id::TEXT AND b.entity_type ='DEVICE' AND b.attribute_key='lastActivityTime'
         LEFT JOIN attribute_kv c ON ifd.tb_device_id = c.entity_id::TEXT AND c.entity_type ='DEVICE' AND c.attribute_key='lastDisconnectTime'
         LEFT JOIN attribute_kv e ON ifd.tb_device_id = e.entity_id::TEXT AND e.entity_type ='DEVICE' AND e.attribute_key='lastConnectTime'
         LEFT JOIN device d ON d.id::TEXT = ifd.tb_device_id
-        LEFT JOIN iotfs_device idg ON idg.id = ifd.gateway_id
+        LEFT JOIN tk_device idg ON idg.id = ifd.gateway_id
         <where>
             <if test="tenantId !=null and tenantId !=''">
                 AND ifd.tenant_id = #{tenantId}
@@ -153,7 +154,7 @@
     <select id="findGateWayDeviceByTbDeviceId" resultMap="deviceMap">
         SELECT
         <include refid="basicColumns"/>
-        FROM iotfs_device ifd
+        FROM tk_device ifd
         LEFT JOIN relation rl ON ifd.tb_device_id = rl.from_id :: TEXT
         WHERE
         rl.to_id ::TEXT = #{tbDeviceId}
@@ -162,7 +163,7 @@
     </select>
 
     <update id="freshAlarmStatus">
-        UPDATE iotfs_device
+        UPDATE tk_device
         SET alarm_status=#{created}
         WHERE tb_device_id = #{tbDeviceId}
     </update>
@@ -180,9 +181,9 @@
         b.long_v last_online_time,
         d.customer_id :: TEXT AS customer_id
         FROM
-        iotfs_device ifd
+        tk_device ifd
         LEFT JOIN device_profile ifdp ON ifd.profile_id = ifdp.ID ::
-        TEXT LEFT JOIN iotfs_organization io ON io.ID = ifd.organization_id
+        TEXT LEFT JOIN tk_organization io ON io.ID = ifd.organization_id
         LEFT JOIN attribute_kv A ON ifd.tb_device_id = A.entity_id :: TEXT
         AND A.entity_type = 'DEVICE'
         AND A.attribute_key = 'active'
@@ -239,7 +240,7 @@
     </select>
     <select id="findDeviceIdsByCustomerId" resultType="java.lang.String">
         SELECT idi.tb_device_id
-        FROM iotfs_device idi
+        FROM tk_device idi
                  LEFT JOIN device d ON d.id::TEXT = idi.tb_device_id
         WHERE customer_id::TEXT = #{customerId}
     </select>
@@ -330,7 +331,7 @@
     <select id="masterDevices" resultMap="listInform">
         SELECT
         base.tb_device_id as id,base.name,base.device_type
-        FROM  iotfs_device base
+        FROM  tk_device base
         LEFT JOIN device tde ON tde.ID :: TEXT = base.tb_device_id
         <where>
             base.device_type  != 'SENSOR'
@@ -358,7 +359,7 @@
             </if>
         ) base
         LEFT JOIN device tde ON base.to_id = tde.id
-        LEFT JOIN iotfs_device ide ON tde.ID :: TEXT = ide.tb_device_id
+        LEFT JOIN tk_device ide ON tde.ID :: TEXT = ide.tb_device_id
         <where>
             ide.device_type  = 'SENSOR'
             <if test="tenantId !=null and tenantId !=''">
@@ -379,7 +380,7 @@
     <select id="slaveDevice" resultMap="deviceMap">
         SELECT
         <include refid="basicColumns"/>
-        FROM iotfs_device ifd
+        FROM tk_device ifd
         <where>
             ifd.tenant_id = #{tenantId}
             AND  ifd.gateway_id = #{masterId}
@@ -393,7 +394,7 @@
         FROM  ts_kv_dictionary base
         LEFT JOIN ts_kv_latest latest ON latest.key = base.key_id
         LEFT JOIN device tb ON tb.ID  = latest.entity_id
-        LEFT JOIN iotfs_device iot ON tb.ID :: TEXT = iot.tb_device_id
+        LEFT JOIN tk_device iot ON tb.ID :: TEXT = iot.tb_device_id
         <where>
             iot.tenant_id = #{tenantId}
             <if test="customerId !=null and customerId !=''">

@@ -20,7 +20,7 @@
     </resultMap>
 
     <select id="listBySceneId" resultMap="actionDTO">
-        SELECT *   FROM iotfs_do_action WHERE scene_linkage_id  = #{sceneId}
+        SELECT *   FROM tk_do_action WHERE scene_linkage_id  = #{sceneId}
     </select>
 
 </mapper>

@@ -19,7 +19,7 @@
     </resultMap>
 
     <select id="listBySceneId" resultMap="conditionDTO">
-        SELECT *   FROM iotfs_do_condition WHERE scene_linkage_id  = #{sceneId}
+        SELECT *   FROM tk_do_condition WHERE scene_linkage_id  = #{sceneId}
     </select>
 
 </mapper>

@@ -25,7 +25,7 @@
     <select id="getEnableConfigByMessageAndPlatform" resultMap="messageConfigDTOMap">
         SELECT
         <include refid="columns"/>
-        FROM message_config
+        FROM sys_message_config
         <where>
             status = 1
             <if test="messageType !=null and messageType != ''">AND message_type = #{messageType}</if>

@@ -28,7 +28,7 @@
     <select id="getTemplatePage" resultMap="messageTemplateDTOMap">
         SELECT
         <include refid="columns"/>
-        FROM message_template mt LEFT JOIN message_config mc ON
+        FROM tk_message_template mt LEFT JOIN tk_message_config mc ON
         mt.message_config_id=mc.id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId != ''">
@@ -46,7 +46,7 @@
     <select id="findMessageTemplate" resultMap="messageTemplateDTOMap">
         SELECT
         <include refid="columns"/>
-        FROM message_template mt LEFT JOIN message_config mc ON
+        FROM tk_message_template mt LEFT JOIN tk_message_config mc ON
         mt.message_config_id=mc.id
         <where>
             <if test="id !=null and id != ''">mt.id = #{id}</if>

@@ -18,7 +18,7 @@
     <select id="findOrganizationTreeList" resultMap="organizationDTOMap">
         WITH RECURSIVE organization AS (
         SELECT id, parent_id, name, sort,creator,create_time,updater,update_time,remark,tenant_id
-        FROM iotfs_organization
+        FROM tk_organization
         WHERE tenant_id = #{tenantId}
         <if test="organizationIds !=null and organizationIds.size() &gt; 0">
             AND id IN
@@ -28,7 +28,7 @@
         </if>
         UNION ALL
         SELECT ig.id, ig.parent_id, ig.name, ig.sort,ig.creator,ig.create_time,ig.updater,ig.update_time,ig.remark,ig.tenant_id
-        FROM iotfs_organization ig
+        FROM tk_organization ig
         JOIN organization ON ig.parent_id = organization.id
         WHERE ig.tenant_id = #{tenantId}
         )

@@ -31,8 +31,8 @@
     <select id="getReportFormConfigPage" resultMap="formConfigDtoMap">
         SELECT
         <include refid="columns"/>,io.name as organization_name,su.real_name as create_user_name
-        FROM iotfs_report_form_config config
-        LEFT JOIN iotfs_organization io ON io.id = config.organization_id
+        FROM tk_report_form_config config
+        LEFT JOIN tk_organization io ON io.id = config.organization_id
         LEFT JOIN sys_user su ON config.creator = su.id
         <where>
             config.tenant_id = #{queryMap.tenantId}

@@ -25,9 +25,9 @@
     <select id="getScenePage" resultMap="sceneLinkageMap">
         SELECT
         <include refid="columns"/>,su.real_name creator_name
-        FROM iotfs_scene_linkage s
+        FROM tk_scene_linkage s
         LEFT JOIN sys_user su ON su.id = s.creator
-        LEFT JOIN iotfs_organization io ON io.id = s.organization_id
+        LEFT JOIN tk_organization io ON io.id = s.organization_id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND s.tenant_id = #{queryMap.tenantId}

@@ -7,7 +7,6 @@
         <result property="dictName" column="dict_name"/>
         <result property="dictCode" column="dict_code"/>
         <result property="description" column="description"/>
-        <result property="tenantId" column="tenant_id"/>
         <result property="creator" column="creator"/>
         <result property="createTime" column="create_time"/>
         <result property="updater" column="updater"/>

@@ -19,7 +19,7 @@
     </resultMap>
 
     <select id="listBySceneId" resultMap="triggerDTO">
-        SELECT *   FROM iotfs_trigger WHERE scene_linkage_id  = #{sceneId}
+        SELECT *   FROM tk_trigger WHERE scene_linkage_id  = #{sceneId}
     </select>
 
 </mapper>

@@ -39,8 +39,8 @@
     <select id="alarmPage" resultMap="alarmInfo">
         SELECT d.name AS device_name,d.id device_id,m.*,d.organization_id,org.name organization_name
         FROM alarm m
-        LEFT JOIN iotfs_device d ON m.originator_id = d.tb_device_id::uuid
-        LEFT JOIN iotfs_organization org ON org.id = d.organization_id
+        LEFT JOIN tk_device d ON m.originator_id = d.tb_device_id::uuid
+        LEFT JOIN tk_organization org ON org.id = d.organization_id
         <where>
             m.tenant_id = #{tenantId}
             <if test="customerId!=null">

@@ -34,7 +34,7 @@
         SELECT
         <include refid="basicColumns"/>
         FROM device_profile base
-        LEFT JOIN iotfs_device_profile iot ON iot.tb_profile_id = base.id::TEXT
+        LEFT JOIN tk_device_profile iot ON iot.tb_profile_id = base.id::TEXT
         <where>
             <if test="tenantId !=null and tenantId !=''">
                 AND base.tenant_id::TEXT = #{tenantId}
@@ -53,7 +53,7 @@
         SELECT
         <include refid="basicColumns"/>
         FROM device_profile base
-        LEFT JOIN iotfs_device_profile iot ON iot.tb_profile_id = base.id::TEXT
+        LEFT JOIN tk_device_profile iot ON iot.tb_profile_id = base.id::TEXT
         <where>
             <if test="tenantId !=null and tenantId !=''">
                 AND iot.tenant_id = #{tenantId}
@@ -67,7 +67,7 @@
         SELECT
         <include refid="basicColumns"/>
         FROM device_profile base
-        LEFT JOIN iotfs_device_profile iot ON iot.tb_profile_id = base.id::TEXT
+        LEFT JOIN tk_device_profile iot ON iot.tb_profile_id = base.id::TEXT
         <where>
              iot.tenant_id = #{tenantId}
             <if test="scriptId !=null and scriptId !=''">

@@ -45,8 +45,8 @@
     <select id="getPageDatas" resultMap="dataMap">
         SELECT  <include refid="detailColumns"/>
         FROM rpc base
-        LEFT JOIN iotfs_device dev ON base.device_id =dev.tb_device_id::uuid
-        LEFT JOIN iotfs_organization org ON dev.organization_id = org.id
+        LEFT JOIN tk_device dev ON base.device_id =dev.tb_device_id::uuid
+        LEFT JOIN tk_organization org ON dev.organization_id = org.id
         LEFT JOIN tenant ten ON base.tenant_id = ten.id
         <where>
             1=1

@@ -5,7 +5,7 @@
 
     <select id="login" resultType="org.thingsboard.server.dao.yunteng.entities.User">
         SELECT sus.*
-        FROM iotfs_third_user base
+        FROM tk_third_user base
         LEFT JOIN sys_user sus ON base.app_user_id = sus.id
         LEFT JOIN sys_tenant ste ON ste.tenant_id = sus.tenant_id
         <where>

@@ -47,9 +47,9 @@
     <select id="getVideoPage" resultMap="videoMap">
         SELECT
         <include refid="detailColumns"/>
-        FROM iotfs_device_camera base
-        LEFT JOIN iotfs_organization org ON org.id = base.organization_id
-        LEFT JOIN iotfs_video_platform ivp ON ivp.id = base.video_platform_id
+        FROM tk_device_camera base
+        LEFT JOIN tk_organization org ON org.id = base.organization_id
+        LEFT JOIN tk_video_platform ivp ON ivp.id = base.video_platform_id
         <where>
             <if test="tenantId !=null and tenantId !=''">
                 AND base.tenant_id = #{tenantId}
@@ -72,9 +72,9 @@
     <select id="getVideoInfosByTenantIdOrAccessModeOrId" resultMap="videoMap">
         SELECT
         <include refid="detailColumns"/>
-        FROM iotfs_device_camera base
-        LEFT JOIN iotfs_organization org ON org.id = base.organization_id
-        LEFT JOIN iotfs_video_platform ivp ON ivp.id = base.video_platform_id
+        FROM tk_device_camera base
+        LEFT JOIN tk_organization org ON org.id = base.organization_id
+        LEFT JOIN tk_video_platform ivp ON ivp.id = base.video_platform_id
         <where>
             <if test="tenantId !=null and tenantId !=''">
                 AND base.tenant_id = #{tenantId}

@@ -23,7 +23,7 @@
     <select id="getVideoPlatformPage" resultMap="videoPlatformMap">
         SELECT
         <include refid="basicColumns"/>
-        FROM iotfs_video_platform base
+        FROM tk_video_platform base
         <where>
             <if test="tenantId !=null and tenantId !=''">
                 AND base.tenant_id = #{tenantId}