fix: renamed class

@@ -5,7 +5,6 @@ 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;
@@ -94,7 +93,7 @@ public class ThingsModelController extends BaseController {
       @PathVariable("deviceProfileId") String deviceProfileId)
       throws ThingsboardException {
     return ResponseEntity.ok(
-        thingsModelService.getTingsModelJson(
+        thingsModelService.getTingsModelTSL(
             functionType, getCurrentUser().getCurrentTenantId(), deviceProfileId));
   }
 

@@ -18,7 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 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.entities.YtAlarmEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 
 import java.util.HashMap;
@@ -46,7 +46,7 @@ public class YtAlarmInfoController extends BaseController {
     @ApiOperation(value = "查询")
     @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
     @GetMapping(params = {PAGE_SIZE, PAGE})
-    public YtPageData<YtAlarmEntity> pageAlarmInfo(
+    public YtPageData<TkAlarmEntity> pageAlarmInfo(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "status", required = false) List<AlarmStatus> status,

@@ -130,7 +130,7 @@ public class YtDeviceController extends BaseController {
     return ResponseEntity.ok(result);
   }
 
-  private DeviceId updateTbDevice(Device tbDevice, YtCredentialsDto formCredentials)
+  private DeviceId updateTbDevice(Device tbDevice, TkCredentialsDto formCredentials)
       throws ThingsboardException {
     Device oldDevice = null;
     boolean created = tbDevice.getId() == null;

@@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -35,7 +34,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidatio
 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.YtDeviceScriptDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
@@ -68,7 +67,7 @@ public class YtDeviceScriptController extends BaseController {
   @PostMapping()
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:js:post','api:yt:js:update'})")
   @ApiOperation("创建 | 编辑")
-  public ResponseEntity<YtDeviceScriptDTO> saveJavaScript(@RequestBody YtDeviceScriptDTO scriptDTO)
+  public ResponseEntity<TkDeviceScriptDTO> saveJavaScript(@RequestBody TkDeviceScriptDTO scriptDTO)
       throws ThingsboardException {
     String id = scriptDTO.getId();
     boolean created = StringUtils.isBlank(id);
@@ -135,7 +134,7 @@ public class YtDeviceScriptController extends BaseController {
   @GetMapping("{id}")
   @ApiOperation("详情")
   //    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:get'})")
-  public ResponseEntity<YtDeviceScriptDTO> getDevice(@PathVariable("id") String id)
+  public ResponseEntity<TkDeviceScriptDTO> getDevice(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.of(
         scriptService.getDeviceScript(getCurrentUser().getCurrentTenantId(), id));
@@ -144,7 +143,7 @@ public class YtDeviceScriptController extends BaseController {
   @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页查询")
-  public YtPageData<YtDeviceScriptDTO> pageDeviceProfile(
+  public YtPageData<TkDeviceScriptDTO> pageDeviceProfile(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
       @RequestParam(value = "name", required = false) String name,
@@ -161,7 +160,7 @@ public class YtDeviceScriptController extends BaseController {
   @GetMapping("/me/list")
   @ApiOperation("选项列表")
   public ResponseEntity listDeviceProfile() throws ThingsboardException {
-    List<YtDeviceScriptDTO> results =
+    List<TkDeviceScriptDTO> results =
         scriptService.findDeviceScript(getCurrentUser().getCurrentTenantId());
     return ResponseEntity.ok(results);
   }

@@ -10,11 +10,11 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtOpinionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkOpinionDTO;
 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.entities.YtOpinionEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkOpinionEntity;
 import org.thingsboard.server.dao.yunteng.service.YtOpinionService;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -30,7 +30,7 @@ public class YtOpinionController extends BaseController {
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
     @PreAuthorize("hasAnyAuthority('PLATFORM_ADMIN','SYS_ADMIN')")
-    public YtPageData<YtOpinionDTO> pageAlarmProfile(
+    public YtPageData<TkOpinionDTO> pageAlarmProfile(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "status", required = false) Boolean status,
@@ -41,7 +41,7 @@ public class YtOpinionController extends BaseController {
             throws ThingsboardException {
 
 
-        IPage<YtOpinionEntity> pageInfrom = opinionService.getPage(page, pageSize, orderBy, orderType);
+        IPage<TkOpinionEntity> pageInfrom = opinionService.getPage(page, pageSize, orderBy, orderType);
         return opinionService.pageDatas(pageInfrom,
                 getCurrentUser().isPtTenantAdmin(),
                 getCurrentUser().getCurrentTenantId(),
@@ -51,8 +51,8 @@ public class YtOpinionController extends BaseController {
 
     @PostMapping
     @ApiOperation("新增|编辑")
-    public YtOpinionDTO saveOrUpdateAlarmProfile(
-            @Validated @RequestBody YtOpinionDTO dto) throws ThingsboardException {
+    public TkOpinionDTO saveOrUpdateAlarmProfile(
+            @Validated @RequestBody TkOpinionDTO dto) throws ThingsboardException {
         dto.setTenantId(getCurrentUser().getCurrentTenantId());
         return opinionService.saveOrUpdate(dto);
     }
@@ -68,7 +68,7 @@ public class YtOpinionController extends BaseController {
 
     @GetMapping("{entityId}")
     @ApiOperation("详情")
-    public YtOpinionDTO detail(@PathVariable("entityId") String entityId)
+    public TkOpinionDTO detail(@PathVariable("entityId") String entityId)
             throws ThingsboardException {
         return opinionService.detail(getCurrentUser().getCurrentTenantId(), entityId);
     }

@@ -9,18 +9,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
-import org.thingsboard.server.common.data.yunteng.dto.YtRpcRecordDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkRpcRecordDTO;
 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.entities.YtRpcRecordEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity;
 import org.thingsboard.server.dao.yunteng.service.YtRpcRecordService;
 
-import java.util.UUID;
-
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 /**
@@ -35,7 +31,7 @@ public class YtRpcRecordController extends BaseController {
 
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
-    public YtPageData<YtRpcRecordDTO> pageAlarmProfile(
+    public YtPageData<TkRpcRecordDTO> pageAlarmProfile(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "status", required = false) RpcStatus status,
@@ -48,7 +44,7 @@ public class YtRpcRecordController extends BaseController {
             throws ThingsboardException {
 
 
-        IPage<YtRpcRecordEntity> pageInfrom = recordService.getPage(page, pageSize, orderBy, orderType);
+        IPage<TkRpcRecordEntity> pageInfrom = recordService.getPage(page, pageSize, orderBy, orderType);
         return recordService.pageDatas(pageInfrom, getCurrentUser().getCurrentTenantId(), tbDeviceId,null, status, organizationId, name);
     }
 

@@ -9,7 +9,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.UserCredentials;
@@ -18,14 +17,13 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.AuthorizeDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkThirdUserDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
-import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
 import org.thingsboard.server.dao.yunteng.service.YtUserService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRepository;
@@ -55,7 +53,7 @@ public class YtThirdPlatformController extends BaseController {
 
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
-    public YtPageData<YtThirdUserDTO> pageAlarmProfile(
+    public YtPageData<TkThirdUserDTO> pageAlarmProfile(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "platformName", required = false) ThirdPlatformEnum platformName,
@@ -65,21 +63,21 @@ public class YtThirdPlatformController extends BaseController {
             throws ThingsboardException {
 
 
-        IPage<YtThirdUserEntity> pageInfrom = thirdService.getPage(page, pageSize, orderBy, orderType);
+        IPage<TkThirdUserEntity> pageInfrom = thirdService.getPage(page, pageSize, orderBy, orderType);
         return thirdService.pageDatas(pageInfrom, platformName, name);
     }
 
     @PostMapping("bind")
     @ApiOperation("绑定")
     public YtLoginResponse saveOrUpdateAlarmProfile(
-            @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
+            @Validated @RequestBody TkThirdUserDTO dto) throws ThingsboardException {
         UserDTO userDto = thirdService.bindUser(dto);
         return buildJwtToken(userDto, dto.getThirdUserId());
     }
 
     @DeleteMapping
     @ApiOperation("解绑(第三方小程序)")
-    public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody YtThirdUserDTO dto)
+    public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody TkThirdUserDTO dto)
             throws ThingsboardException {
         return thirdService.unbindUser(getCurrentUser().getCurrentTenantId(), dto.getAppUserId(), dto.getThirdUserId());
     }

@@ -39,6 +39,7 @@ import org.thingsboard.server.common.data.yunteng.utils.ExcelUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.yunteng.entities.SysUserEntity;
 import org.thingsboard.server.dao.yunteng.service.YtUserService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -268,7 +269,7 @@ public class YtUserController extends AbstractUserAccount {
   @ApiOperation(value = "修改密码")
   public ResponseResult<Boolean> changePassword(@RequestBody AccountReqDTO accountReqDTO)
       throws ThingsboardException {
-    org.thingsboard.server.dao.yunteng.entities.User user =
+    SysUserEntity user =
         userService.validateChangePasswordAccount(accountReqDTO);
     String resetPassword = accountReqDTO.getResetPassword();
     if (!getCurrentUser().isPtAdmin()) {

@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtVideoDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkVideoDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 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.yunteng.entities.YtVideoEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
 import org.thingsboard.server.dao.yunteng.service.YtVideoService;
 
 import java.util.HashMap;
@@ -34,7 +34,7 @@ public class YtVideoController extends BaseController {
 
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
-    public YtPageData<YtVideoDTO> pageAlarmProfile(
+    public YtPageData<TkVideoDTO> pageAlarmProfile(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "status", required = false) Boolean status,
@@ -45,7 +45,7 @@ public class YtVideoController extends BaseController {
             throws ThingsboardException {
 
 
-        IPage<YtVideoEntity> pageInfrom = videoService.getPage(page, pageSize, orderBy, orderType);
+        IPage<TkVideoEntity> pageInfrom = videoService.getPage(page, pageSize, orderBy, orderType);
         return videoService.pageDatas(pageInfrom,
                 getCurrentUser().isPtTenantAdmin(),
                 getCurrentUser().getCurrentTenantId(),
@@ -56,8 +56,8 @@ public class YtVideoController extends BaseController {
     @PostMapping
     @ApiOperation("新增|编辑")
     @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:post','api:yt:video:update'})")
-    public YtVideoDTO saveOrUpdateAlarmProfile(
-            @Validated @RequestBody YtVideoDTO dto) throws ThingsboardException {
+    public TkVideoDTO saveOrUpdateAlarmProfile(
+            @Validated @RequestBody TkVideoDTO dto) throws ThingsboardException {
         dto.setTenantId(getCurrentUser().getCurrentTenantId());
         return videoService.saveOrUpdate(dto);
     }
@@ -74,7 +74,7 @@ public class YtVideoController extends BaseController {
     @GetMapping("{entityId}")
     @ApiOperation("详情")
     @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:get'})")
-    public YtVideoDTO detail(@PathVariable("entityId") String entityId)
+    public TkVideoDTO detail(@PathVariable("entityId") String entityId)
             throws ThingsboardException {
         return videoService.detail(getCurrentUser().getCurrentTenantId(), entityId);
     }

@@ -10,11 +10,11 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtVideoPlatformDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkVideoPlatformDTO;
 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.entities.YtVideoPlatformEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkVideoPlatformEntity;
 import org.thingsboard.server.dao.yunteng.service.YtVideoPlatformService;
 
 import java.util.List;
@@ -32,7 +32,7 @@ public class YtVideoPlatformController extends BaseController {
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页")
-  public YtPageData<YtVideoPlatformDTO> pageVideoPlatform(
+  public YtPageData<TkVideoPlatformDTO> pageVideoPlatform(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
       @RequestParam(value = "host", required = false) String host,
@@ -40,7 +40,7 @@ public class YtVideoPlatformController extends BaseController {
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
 
-    IPage<YtVideoPlatformEntity> pageInfo =
+    IPage<TkVideoPlatformEntity> pageInfo =
         videoPlatformService.getPage(page, pageSize, orderBy, orderType);
     return videoPlatformService.page(
         pageInfo,
@@ -54,8 +54,8 @@ public class YtVideoPlatformController extends BaseController {
   @ApiOperation("新增|编辑")
   @PreAuthorize(
       "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:platform:post','api:yt:video:platform:update'})")
-  public YtVideoPlatformDTO saveOrUpdateVideoPlatform(
-      @Validated @RequestBody YtVideoPlatformDTO dto) throws ThingsboardException {
+  public TkVideoPlatformDTO saveOrUpdateVideoPlatform(
+      @Validated @RequestBody TkVideoPlatformDTO dto) throws ThingsboardException {
     dto.setTenantId(getCurrentUser().getCurrentTenantId());
     return videoPlatformService.saveOrUpdate(dto);
   }
@@ -72,7 +72,7 @@ public class YtVideoPlatformController extends BaseController {
 
   @GetMapping
   @ApiOperation("获取当前用户的流媒体配置列表")
-  public List<YtVideoPlatformDTO> getVideoPlatformsByUser() throws ThingsboardException {
+  public List<TkVideoPlatformDTO> getVideoPlatformsByUser() throws ThingsboardException {
     return videoPlatformService.getVideoPlatformsByUser(getCurrentUser().getCurrentTenantId());
   }
 }

@@ -2,7 +2,7 @@ package org.thingsboard.server.common.data.yunteng.common;
 
 import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
 
-public interface YtCommonService {
+public interface TkCommonService {
   /**
    * 通过dict表的Code和dictItem的codeText查询字典表的值
    *

@@ -12,7 +12,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.yunteng.common.YtCommonService;
+import org.thingsboard.server.common.data.yunteng.common.TkCommonService;
 import org.thingsboard.server.common.data.yunteng.common.aspect.annotation.AutoDict;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
@@ -31,7 +31,7 @@ import java.util.List;
 @ConditionalOnExpression("('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core') ")
 public class SysDictAspect {
 
-  private final YtCommonService commonService;
+  private final TkCommonService commonService;
 
   /** 表对应字段加上_dictText即可显示出文本 */
   private static final String DICT_TEXT_SUFFIX = "DictText";

@@ -44,7 +44,7 @@ public class DeviceDTO extends TenantDTO {
     private String gatewayName;
 
     @ApiModelProperty(value = "设备凭证")
-    private YtCredentialsDto deviceToken;
+    private TkCredentialsDto deviceToken;
 
     private String tbDeviceId;
     @ApiModelProperty(value = "设备厂商")

@@ -29,7 +29,7 @@ import java.util.UUID;
 
 @ApiModel
 @Data
-public class YtCredentialsDto  {
+public class TkCredentialsDto {
 
     private static final long serialVersionUID = -7869261127032877765L;
     @ApiModelProperty(position = 1, readOnly = true, value = "The Id is automatically generated during device creation. " +

@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class YtDeviceScriptDTO extends BaseDTO {
+public class TkDeviceScriptDTO extends BaseDTO {
   @NotEmpty(
       message = "解析脚本名称不能为空或者空字符串",
       groups = {AddGroup.class, UpdateGroup.class})
@@ -39,5 +39,5 @@ public class YtDeviceScriptDTO extends BaseDTO {
   @ApiModelProperty(value = "脚本编数据编码类型:HEX ASCII")
   private TcpDataTypeEnum dataType;
 
-  public YtDeviceScriptDTO() {}
+  public TkDeviceScriptDTO() {}
 }

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotEmpty;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class YtOpinionDTO extends TenantDTO {
+public class TkOpinionDTO extends TenantDTO {
     @ApiModelProperty(value = "意见标题", required = true)
     private String title;
 

@@ -4,13 +4,13 @@ import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.YtRpcStatus;
+import org.thingsboard.server.common.data.yunteng.enums.TkRpcStatus;
 
 /**
  * @author Administrator
  */
 @Data
-public class YtRpcRecordDTO  {
+public class TkRpcRecordDTO {
     private String id;
 
     @ApiModelProperty(value = "设备主键")
@@ -44,12 +44,12 @@ public class YtRpcRecordDTO  {
     @ApiModelProperty(value = "RPC扩展信息")
     private JsonNode additionalInfo;
     @ApiModelProperty(value = "RPC状态")
-    private YtRpcStatus status;
+    private TkRpcStatus status;
 
 
     private String statusName;
 
     public String getStatusName() {
-        return YtRpcStatus.getLabel(status.name());
+        return TkRpcStatus.getLabel(status.name());
     }
 }

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotEmpty;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class YtThirdUserDTO extends BaseDTO {
+public class TkThirdUserDTO extends BaseDTO {
 
     @ApiModelProperty(value = "第三方平台", required = true)
     private ThirdPlatformEnum platformName;

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotEmpty;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class YtVideoDTO extends TenantDTO {
+public class TkVideoDTO extends TenantDTO {
     @ApiModelProperty(value = "摄像头附加信息，json格式")
     private String additionalJson;
 
@@ -52,7 +52,7 @@ public class YtVideoDTO extends TenantDTO {
     private Integer playProtocol;
 
     @ApiModelProperty("流媒体平台基础信息")
-    private YtVideoPlatformDTO videoPlatformDTO;
+    private TkVideoPlatformDTO videoPlatformDTO;
 
 
 }

@@ -11,7 +11,7 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class YtVideoPlatformDTO extends TenantDTO {
+public class TkVideoPlatformDTO extends TenantDTO {
     @ApiModelProperty(value = "平台类型",required = true)
     @NotNull(message = "平台类型不能为空")
     @Max(value = 2,message = "平台类型最大长度2")

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

@@ -18,16 +18,16 @@ package org.thingsboard.server.common.data.yunteng.enums;
 /**
  * Created by ashvayka on 11.05.17.
  */
-public enum YtAlarmSeverity {
+public enum TkAlarmSeverity {
     CRITICAL("危险"), MAJOR("重要"), MINOR("次要"), WARNING("警告"), INDETERMINATE("不确定");
 
-    YtAlarmSeverity(String label){
+    TkAlarmSeverity(String label){
         this.label = label;
     }
     String label;
 
     public static String getLabel(String name){
-        for(YtAlarmSeverity type:values()){
+        for(TkAlarmSeverity type:values()){
             if(type.name().equals(name)){
                 return type.label;
             }

@@ -15,15 +15,15 @@
  */
 package org.thingsboard.server.common.data.yunteng.enums;
 
-public enum YtRpcStatus {
+public enum TkRpcStatus {
     QUEUED("队列中"), SENT("已发送"), DELIVERED("处理中"), SUCCESSFUL("成功"), TIMEOUT("超时"), EXPIRED("过期"), FAILED("失败");
 
     String label;
-    YtRpcStatus(String label){
+    TkRpcStatus(String label){
         this.label= label;
     }
     public static String getLabel(String name){
-        for(YtRpcStatus type:values()){
+        for(TkRpcStatus type:values()){
             if(type.name().equals(name)){
                 return type.label;
             }

@@ -11,8 +11,8 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysJobLogDTO;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
-import org.thingsboard.server.dao.yunteng.entities.SysJob;
-import org.thingsboard.server.dao.yunteng.entities.SysJobLog;
+import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
+import org.thingsboard.server.dao.yunteng.entities.SysJobLogEntity;
 import org.thingsboard.server.dao.yunteng.service.YtSysJobLogService;
 
 import java.time.LocalDateTime;
@@ -26,7 +26,7 @@ public abstract class AbstractQuartzJob implements Job {
 
   @Override
   public void execute(JobExecutionContext context) throws JobExecutionException {
-    SysJob sysJob = new SysJob();
+    SysJobEntity sysJob = new SysJobEntity();
     BeanUtils.copyProperties(
         context.getMergedJobDataMap().get(FastIotConstants.ScheduleConstants.TASK_PROPERTIES),
         sysJob);
@@ -50,11 +50,11 @@ public abstract class AbstractQuartzJob implements Job {
    *
    * @param sysJob 系统计划任务
    */
-  protected void after(SysJob sysJob, Exception e) {
+  protected void after(SysJobEntity sysJob, Exception e) {
     LocalDateTime startTime = threadLocal.get();
     threadLocal.remove();
 
-    final SysJobLog sysJobLog = new SysJobLog();
+    final SysJobLogEntity sysJobLog = new SysJobLogEntity();
     sysJobLog.setJobId(sysJob.getId());
     sysJobLog.setJobName(sysJob.getJobName());
     sysJobLog.setJobGroup(sysJob.getJobGroup());
@@ -85,5 +85,5 @@ public abstract class AbstractQuartzJob implements Job {
    * @param sysJob 系统计划任务
    * @throws Exception 执行过程中的异常
    */
-  protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception;
+  protected abstract void doExecute(JobExecutionContext context, SysJobEntity sysJob) throws Exception;
 }

@@ -5,7 +5,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ReportGenerateRecordDTO;
 import org.thingsboard.server.common.data.yunteng.enums.JobGroupEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
-import org.thingsboard.server.dao.yunteng.entities.SysJob;
+import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
 import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
 
@@ -21,7 +21,7 @@ public class JobInvokeUtil {
    *
    * @param sysJob 系统任务
    */
-  public static void invokeMethod(SysJob sysJob) throws Exception {
+  public static void invokeMethod(SysJobEntity sysJob) throws Exception {
     String invokeTarget = sysJob.getInvokeTarget();
     String beanName = getBeanName(invokeTarget);
     String methodName = getMethodName(invokeTarget);

@@ -3,7 +3,7 @@ package org.thingsboard.server.dao.util.yunteng;
 
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
-import org.thingsboard.server.dao.yunteng.entities.SysJob;
+import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
 
 /**
  * 定时任务处理（禁止并发执行）
@@ -14,7 +14,7 @@ import org.thingsboard.server.dao.yunteng.entities.SysJob;
 public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob
 {
     @Override
-    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
+    protected void doExecute(JobExecutionContext context, SysJobEntity sysJob) throws Exception
     {
         JobInvokeUtil.invokeMethod(sysJob);
     }

@@ -2,7 +2,7 @@ package org.thingsboard.server.dao.util.yunteng;
 
 
 import org.quartz.JobExecutionContext;
-import org.thingsboard.server.dao.yunteng.entities.SysJob;
+import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
 
 /**
  * 定时任务处理（允许并发执行）
@@ -12,7 +12,7 @@ import org.thingsboard.server.dao.yunteng.entities.SysJob;
 public class QuartzJobExecution extends AbstractQuartzJob
 {
     @Override
-    protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
+    protected void doExecute(JobExecutionContext context, SysJobEntity sysJob) throws Exception
     {
         JobInvokeUtil.invokeMethod(sysJob);
     }

@@ -7,7 +7,7 @@ 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.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
-import org.thingsboard.server.dao.yunteng.entities.SysJob;
+import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
 
 import java.util.Objects;
 
@@ -22,7 +22,7 @@ public class ScheduleUtils {
    * @param sysJob 执行计划
    * @return 具体执行任务类
    */
-  private static Class<? extends Job> getQuartzJobClass(SysJob sysJob) {
+  private static Class<? extends Job> getQuartzJobClass(SysJobEntity sysJob) {
     boolean isConcurrent = 0 == sysJob.getConcurrent();
     return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
   }
@@ -39,7 +39,7 @@ public class ScheduleUtils {
   }
 
   /** 创建定时任务 */
-  public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException {
+  public static void createScheduleJob(Scheduler scheduler, SysJobEntity job) throws SchedulerException {
     Class<? extends Job> jobClass = getQuartzJobClass(job);
     // 构建job信息
     String jobId = job.getId();
@@ -82,7 +82,7 @@ public class ScheduleUtils {
 
   /** 设置定时任务策略 */
   public static CronScheduleBuilder handleCronScheduleMisfirePolicy(
-      SysJob job, CronScheduleBuilder cb) throws YtDataValidationException {
+          SysJobEntity job, CronScheduleBuilder cb) throws YtDataValidationException {
     switch (job.getMisfirePolicy()) {
       case FastIotConstants.ScheduleConstants.MISFIRE_DEFAULT:
         return cb;

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

@@ -13,7 +13,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @Data
 @RequiredArgsConstructor
 @TableName(ModelConstants.Table.SYS_APP_DESIGN_TABLE_NAME)
-public class SysAppDesign extends TenantBaseEntity {
+public class SysAppDesignEntity extends TenantBaseEntity {
   private static final long serialVersionUID = -3412813210017919075L;
   /** 平台名称 */
   private String name;

@@ -12,7 +12,7 @@ import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
  */
 @Data
 @TableName(ModelConstants.Table.SYS_AREA_TABLE_NAME)
-public class SysArea{
+public class SysAreaEntity {
   private Long parentId;
   private AreaLevelEnum level;
   private String name;

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

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

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

@@ -15,7 +15,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @Data
 @RequiredArgsConstructor
 @TableName(ModelConstants.Table.SYS_ENTERPRISE_TABLE_NAME)
-public class SysEnterprise extends TenantBaseEntity {
+public class SysEnterpriseEntity extends TenantBaseEntity {
   private static final long serialVersionUID = -804373668052255756L;
   /** 公司名称 */
   private String name;

@@ -10,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName(ModelConstants.Table.SYS_JOB_TABLE_NAME)
-public class SysJob extends TenantBaseEntity {
+public class SysJobEntity extends TenantBaseEntity {
 
   private static final long serialVersionUID = -5277603237529335023L;
   /** 任务名称 */

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName(ModelConstants.Table.SYS_JOB_LOG_TABLE_NAME)
-public class SysJobLog extends BaseEntity {
+public class SysJobLogEntity extends BaseEntity {
 
   private static final long serialVersionUID = 1739849551616104371L;
 

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

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName(ModelConstants.Table.SYS_NOTICE_TABLE_NAME)
-public class SysNotice extends TenantBaseEntity {
+public class SysNoticeEntity extends TenantBaseEntity {
 
   private static final long serialVersionUID = 3466370312762440488L;
   /** 通知类型 */

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName(ModelConstants.Table.SYS_NOTICE_USER_TABLE_NAME)
-public class SysNoticeUser extends TenantBaseEntity {
+public class SysNoticeUserEntity extends TenantBaseEntity {
 
   private static final long serialVersionUID = -5421685500963791707L;
   /** 接收者ID */

@@ -13,7 +13,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @Data
 @RequiredArgsConstructor
 @TableName(ModelConstants.Table.SYS_PLATFORM_DESIGN_TABLE_NAME)
-public class SysPlatformDesign extends TenantBaseEntity {
+public class SysPlatformDesignEntity extends TenantBaseEntity {
   private static final long serialVersionUID = 6761478750642927740L;
   /** 平台名称 */
   private String name;

@@ -10,7 +10,7 @@ import java.time.LocalTime;
 
 @Data
 @TableName(ModelConstants.Table.SYS_RATE_LIMIT_TABLE_NAME)
-public class RateLimiterEntity {
+public class SysRateLimiterEntity {
   private String id;
   private String path;
   private double qps;

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

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

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

@@ -10,7 +10,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName(ModelConstants.Table.SYS_TENANT_ROLE_TABLE_NAME)
-public class TenantRole implements Serializable {
+public class SysTenantRoleEntity implements Serializable {
 
   private static final long serialVersionUID = 7332631758506821892L;
   /** 角色ID */

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName(ModelConstants.Table.SYS_USER_TABLE_NAME)
-public class User extends TenantBaseEntity {
+public class SysUserEntity extends TenantBaseEntity {
   private static final long serialVersionUID = 834982016421849497L;
   private String username;
 

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

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

@@ -17,7 +17,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COLUMN_FAMIL
 
 @Data
 @TableName(ALARM_COLUMN_FAMILY_NAME)
-public class YtAlarmEntity {
+public class TkAlarmEntity {
 
   private static final long serialVersionUID = -4922707705163155569L;
 

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

@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ActTypeEnum;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.TK_CONFIGURATION_ACT, autoResultMap = true)
 @Data
-public class ConfigurationAct extends ConfigurationBaseEntity {
+public class TkConfigurationActEntity extends ConfigurationBaseEntity {
     private static final long serialVersionUID = -4125982858197381343L;
     @TableField(typeHandler = EnumTypeHandler.class)
     private ActTypeEnum type;

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

@@ -8,7 +8,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @EqualsAndHashCode(callSuper = true)
 @TableName(ModelConstants.Table.TK_CONFIGURATION_CONTENT_NAME)
 @Data
-public class ConfigurationContent extends TenantBaseEntity {
+public class TkConfigurationContentEntity extends TenantBaseEntity {
 
   private static final long serialVersionUID = -419380277607655083L;
   private String name;

@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.TK_CONFIGURATION_DATASOURCE, autoResultMap = true)
 @Data
-public class ConfigurationDatasource extends ConfigurationBaseEntity {
+public class TkConfigurationDatasourceEntity extends ConfigurationBaseEntity {
     private static final long serialVersionUID = 2830393872646826226L;
     private String nodeId;
     private String deviceId;

@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.TK_CONFIGURATION_EVENT, autoResultMap = true)
 @Data
-public class ConfigurationEvent extends ConfigurationBaseEntity {
+public class TkConfigurationEventEntity extends ConfigurationBaseEntity {
     private static final long serialVersionUID = 4613503997176066996L;
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode content;

@@ -13,7 +13,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.TK_DATA_BOARD_NAME, autoResultMap = true)
 @Data
-public class DataBoard extends TenantBaseEntity {
+public class TkDataBoardEntity extends TenantBaseEntity {
 
   private static final long serialVersionUID = 1438007769925112807L;
 

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

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

@@ -11,7 +11,7 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.TK_DEVICE_PROFILE_TABLE_NAME, autoResultMap = true)
-public class YtDeviceProfileEntity extends TenantBaseEntity {
+public class TkDeviceProfileEntity extends TenantBaseEntity {
     private String name;
 
     private String scriptId;

@@ -11,7 +11,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
 @Data
 @TableName(value = ModelConstants.Table.TK_DEVICE_SCRIPT_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
-public class YtDeviceScriptEntity extends TenantBaseEntity {
+public class TkDeviceScriptEntity extends TenantBaseEntity {
   private String name;
   private String convertJs;
   /** 告警状态：0：正常 1：告警 */

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

@@ -20,7 +20,7 @@ import java.util.List;
 @Data
 @TableName(value = ModelConstants.Table.TK_DO_ACTION_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
-public class DoAction extends TenantBaseEntity {
+public class TkDoActionEntity extends TenantBaseEntity {
 
     private static final long serialVersionUID = -5459834451418047957L;
 

@@ -20,7 +20,7 @@ import java.util.List;
 @Data
 @TableName(value = ModelConstants.Table.TK_DO_CONDITION_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
-public class DoCondition extends TenantBaseEntity {
+public class TkDoConditionEntity extends TenantBaseEntity {
     private static final long serialVersionUID = 2827674377416477646L;
     /**
      * 设备

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

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

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

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

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

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

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

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

@@ -25,7 +25,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName(ModelConstants.RPC_TABLE_NAME)
-public class YtRpcRecordEntity extends TenantBaseEntity {
+public class TkRpcRecordEntity extends TenantBaseEntity {
 
     private String deviceId;
 

@@ -8,7 +8,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @Data
 @TableName(value = ModelConstants.Table.TK_SCENE_LINKAGE_TABLE_NAME)
 @EqualsAndHashCode(callSuper = true)
-public class SceneLinkage extends TenantBaseEntity {
+public class TkSceneLinkageEntity extends TenantBaseEntity {
 
   private static final long serialVersionUID = -306446373876239910L;
 

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

@@ -13,7 +13,7 @@ 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 {
+public class TkThingsModelEntity extends TenantBaseEntity {
 
   private static final long serialVersionUID = 2265006809255944302L;
 

@@ -12,7 +12,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName(ModelConstants.Table.TK_THIRD_USER_TABLE_NAME)
-public class YtThirdUserEntity extends BaseEntity {
+public class TkThirdUserEntity extends BaseEntity {
 
     private ThirdPlatformEnum platformName;
     private String thirdUserId;

@@ -20,7 +20,7 @@ import java.util.List;
 @Data
 @TableName(value = ModelConstants.Table.TK_TRIGGER_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
-public class Trigger extends TenantBaseEntity {
+public class TkTriggerEntity extends TenantBaseEntity {
 
     private static final long serialVersionUID = -1847061176808850967L;
     /**

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

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

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

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
-import org.thingsboard.server.dao.yunteng.entities.SysAppDesign;
+import org.thingsboard.server.dao.yunteng.entities.SysAppDesignEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysAppDesignMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
@@ -19,23 +19,23 @@ import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class SysAppDesignServiceImpl extends AbstractBaseService<SysAppDesignMapper, SysAppDesign>
+public class SysAppDesignServiceImpl extends AbstractBaseService<SysAppDesignMapper, SysAppDesignEntity>
     implements SysAppDesignService {
   @Override
   public boolean save(SysAppDesignDTO sysAppDesignDTO, String tenantId) {
     if (get(tenantId) != null) {
       return false;
     }
-    SysAppDesign entity = sysAppDesignDTO.getEntity(SysAppDesign.class);
+    SysAppDesignEntity entity = sysAppDesignDTO.getEntity(SysAppDesignEntity.class);
     entity.setTenantId(tenantId);
     return baseMapper.insert(entity) > FastIotConstants.MagicNumber.ZERO;
   }
 
   @Override
   public SysAppDesignDTO get(String tenantId) {
-    SysAppDesign sysAppDesign =
+    SysAppDesignEntity sysAppDesign =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<SysAppDesign>().eq(SysAppDesign::getTenantId, tenantId));
+            new LambdaQueryWrapper<SysAppDesignEntity>().eq(SysAppDesignEntity::getTenantId, tenantId));
     return sysAppDesign == null ? null : sysAppDesign.getDTO(SysAppDesignDTO.class);
   }
 
@@ -43,8 +43,8 @@ public class SysAppDesignServiceImpl extends AbstractBaseService<SysAppDesignMap
   public boolean update(SysAppDesignDTO sysAppDesignDTO, String tenantId) {
     if (get(tenantId) != null) {
       return baseMapper.update(
-              sysAppDesignDTO.getEntity(SysAppDesign.class),
-              new LambdaQueryWrapper<SysAppDesign>().eq(SysAppDesign::getTenantId, tenantId))
+              sysAppDesignDTO.getEntity(SysAppDesignEntity.class),
+              new LambdaQueryWrapper<SysAppDesignEntity>().eq(SysAppDesignEntity::getTenantId, tenantId))
           > FastIotConstants.MagicNumber.ZERO;
     } else {
       return save(sysAppDesignDTO, tenantId);
@@ -54,7 +54,7 @@ public class SysAppDesignServiceImpl extends AbstractBaseService<SysAppDesignMap
   @Override
   public boolean factoryDataReset(String tenantId) {
     return baseMapper.delete(
-            new LambdaQueryWrapper<SysAppDesign>().eq(SysAppDesign::getTenantId, tenantId))
+            new LambdaQueryWrapper<SysAppDesignEntity>().eq(SysAppDesignEntity::getTenantId, tenantId))
         > FastIotConstants.MagicNumber.ZERO;
   }
 }

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
-import org.thingsboard.server.dao.yunteng.entities.SysArea;
+import org.thingsboard.server.dao.yunteng.entities.SysAreaEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysAreaMapper;
 import org.thingsboard.server.dao.yunteng.service.SysAreaService;
 
@@ -34,16 +34,16 @@ public class SysAreaServiceImpl implements SysAreaService {
     if(result == null || result.isEmpty()){
       result = ReflectUtils.sourceToTarget(
               sysAreaMapper.selectList(
-                      new LambdaQueryWrapper<SysArea>()
-                              .eq(sysAreaDTO.getLevel() != null, SysArea::getLevel, sysAreaDTO.getLevel())
+                      new LambdaQueryWrapper<SysAreaEntity>()
+                              .eq(sysAreaDTO.getLevel() != null, SysAreaEntity::getLevel, sysAreaDTO.getLevel())
                               .eq(
                                       sysAreaDTO.getParentId() != null,
-                                      SysArea::getParentId,
+                                      SysAreaEntity::getParentId,
                                       sysAreaDTO.getParentId())
-                              .eq(sysAreaDTO.getCode() != null, SysArea::getCode, sysAreaDTO.getCode())
+                              .eq(sysAreaDTO.getCode() != null, SysAreaEntity::getCode, sysAreaDTO.getCode())
                               .like(
                                       StringUtils.isNotEmpty(sysAreaDTO.getName()),
-                                      SysArea::getName,
+                                      SysAreaEntity::getName,
                                       sysAreaDTO.getName())),
               SysAreaDTO.class);
       cacheManager.getCache(FastIotConstants.CacheKey.area).put(sysAreaDTO.getParentId(),result);
@@ -59,8 +59,8 @@ public class SysAreaServiceImpl implements SysAreaService {
       return null;
     }
     SysAreaDTO target = new SysAreaDTO();
-    SysArea source =
-        sysAreaMapper.selectOne(new LambdaQueryWrapper<SysArea>().eq(SysArea::getCode, code));
+    SysAreaEntity source =
+        sysAreaMapper.selectOne(new LambdaQueryWrapper<SysAreaEntity>().eq(SysAreaEntity::getCode, code));
     if (null != source) {
       BeanUtils.copyProperties(source, target);
     }

@@ -10,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.yunteng.entities.SysDictItem;
+import org.thingsboard.server.dao.yunteng.entities.SysDictItemEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysDictItemMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.SysDictItemService;
@@ -22,7 +22,7 @@ import java.util.Set;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class SysDictItemServiceImpl extends AbstractBaseService<SysDictItemMapper, SysDictItem>
+public class SysDictItemServiceImpl extends AbstractBaseService<SysDictItemMapper, SysDictItemEntity>
     implements SysDictItemService {
 
   @Override
@@ -30,18 +30,18 @@ public class SysDictItemServiceImpl extends AbstractBaseService<SysDictItemMappe
     if (StringUtils.isEmpty((CharSequence) queryMap.get("dictId"))) {
       throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    IPage<SysDictItem> iPage =
+    IPage<SysDictItemEntity> iPage =
         baseMapper.selectPage(
             getPage(queryMap, "create_time", false),
-            new QueryWrapper<SysDictItem>()
+            new QueryWrapper<SysDictItemEntity>()
                 .lambda()
                 .like(
                     queryMap.get("itemText") != null,
-                    SysDictItem::getItemText,
+                    SysDictItemEntity::getItemText,
                     String.valueOf(queryMap.get("itemText")))
                 .eq(
                     queryMap.get("dictId") != null,
-                    SysDictItem::getDictId,
+                    SysDictItemEntity::getDictId,
                     String.valueOf(queryMap.get("dictId"))));
     return getPageData(iPage, SysDictItemDTO.class);
   }
@@ -49,7 +49,7 @@ public class SysDictItemServiceImpl extends AbstractBaseService<SysDictItemMappe
   @Override
   @Transactional
   public SysDictItemDTO saveSysDictItem(SysDictItemDTO sysDictItemDTO,String tenantId) {
-    SysDictItem sysDictItem = new SysDictItem();
+    SysDictItemEntity sysDictItem = new SysDictItemEntity();
     sysDictItemDTO.copyToEntity(sysDictItem);
     sysDictItem.setTenantId(tenantId);
     baseMapper.insert(sysDictItem);
@@ -66,7 +66,7 @@ public class SysDictItemServiceImpl extends AbstractBaseService<SysDictItemMappe
   @Override
   @Transactional
   public SysDictItemDTO updateSysDictItem(SysDictItemDTO sysDictItemDTO,String tenantId) {
-    SysDictItem sysDictItem = baseMapper.selectById(sysDictItemDTO.getId());
+    SysDictItemEntity sysDictItem = baseMapper.selectById(sysDictItemDTO.getId());
     sysDictItemDTO.copyToEntity(sysDictItem);
     sysDictItem.setTenantId(tenantId);
     baseMapper.updateById(sysDictItem);

@@ -12,7 +12,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.SysDict;
+import org.thingsboard.server.dao.yunteng.entities.SysDictEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysDictItemMapper;
 import org.thingsboard.server.dao.yunteng.mapper.SysDictMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -25,25 +25,25 @@ import java.util.Set;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDict>
+public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDictEntity>
     implements SysDictService {
 
   private final SysDictItemMapper sysDictItemMapper;
 
   @Override
   public YtPageData<SysDictDTO> page(Map<String, Object> queryMap) {
-    IPage<SysDict> iPage =
+    IPage<SysDictEntity> iPage =
         baseMapper.selectPage(
             getPage(queryMap, "create_time", false),
-            new QueryWrapper<SysDict>()
+            new QueryWrapper<SysDictEntity>()
                 .lambda()
                 .like(
                     queryMap.get("dictName") != null,
-                    SysDict::getDictName,
+                    SysDictEntity::getDictName,
                     String.valueOf(queryMap.get("dictName")))
                 .like(
                     queryMap.get("dictCode") != null,
-                    SysDict::getDictCode,
+                    SysDictEntity::getDictCode,
                     String.valueOf(queryMap.get("dictCode"))));
     return getPageData(iPage, SysDictDTO.class);
   }
@@ -56,7 +56,7 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi
     if (querySysDict != null) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    SysDict sysDict = new SysDict();
+    SysDictEntity sysDict = new SysDictEntity();
     sysDictDTO.copyToEntity(sysDict);
     sysDict.setTenantId(tenantId);
     baseMapper.insert(sysDict);
@@ -79,7 +79,7 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi
   @Override
   @Transactional
   public SysDictDTO updateSysDict(SysDictDTO sysDictDTO, String tenantId) {
-    SysDict sysDict = baseMapper.selectById(sysDictDTO.getId());
+    SysDictEntity sysDict = baseMapper.selectById(sysDictDTO.getId());
     sysDictDTO.copyToEntity(sysDict);
     sysDict.setTenantId(tenantId);
     baseMapper.updateById(sysDict);

@@ -3,7 +3,6 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
@@ -11,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
 import org.thingsboard.server.common.data.yunteng.dto.AreaInfoDTO;
-import org.thingsboard.server.dao.yunteng.entities.SysEnterprise;
+import org.thingsboard.server.dao.yunteng.entities.SysEnterpriseEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysEnterpriseMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.SysAreaService;
@@ -26,20 +25,20 @@ import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
 @Service
 @RequiredArgsConstructor
 public class SysEnterpriseServiceImpl
-    extends AbstractBaseService<SysEnterpriseMapper, SysEnterprise>
+    extends AbstractBaseService<SysEnterpriseMapper, SysEnterpriseEntity>
     implements SysEnterpriseService {
 
   private final SysAreaService sysAreaService;
 
   @Override
   public boolean save(SysEnterpriseDTO sysAppDesignDTO, String tenantId) {
-    SysEnterprise checkSysEnterprise =
+    SysEnterpriseEntity checkSysEnterprise =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<SysEnterprise>().eq(SysEnterprise::getTenantId, tenantId));
+            new LambdaQueryWrapper<SysEnterpriseEntity>().eq(SysEnterpriseEntity::getTenantId, tenantId));
     if (null != checkSysEnterprise) {
       throw new YtDataValidationException(ErrorMessage.DATA_ALREADY_EXISTS.getMessage());
     }
-    SysEnterprise entity = sysAppDesignDTO.getEntity(SysEnterprise.class);
+    SysEnterpriseEntity entity = sysAppDesignDTO.getEntity(SysEnterpriseEntity.class);
     entity.setTenantId(tenantId);
     return baseMapper.insert(entity) > 0;
   }
@@ -98,8 +97,8 @@ public class SysEnterpriseServiceImpl
   public boolean update(SysEnterpriseDTO sysAppDesignDTO, String tenantId) {
     if (sysAppDesignDTO.getId() != null) {
       return baseMapper.update(
-              sysAppDesignDTO.getEntity(SysEnterprise.class),
-              new LambdaQueryWrapper<SysEnterprise>().eq(SysEnterprise::getTenantId, tenantId))
+              sysAppDesignDTO.getEntity(SysEnterpriseEntity.class),
+              new LambdaQueryWrapper<SysEnterpriseEntity>().eq(SysEnterpriseEntity::getTenantId, tenantId))
           > 0;
     } else {
       return save(sysAppDesignDTO, tenantId);

@@ -13,7 +13,7 @@ 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.SysJobLogDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.SysJobLog;
+import org.thingsboard.server.dao.yunteng.entities.SysJobLogEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysJobLogMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtSysJobLogService;
@@ -24,7 +24,7 @@ import java.util.Optional;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class SysJobLogServiceImpl extends AbstractBaseService<SysJobLogMapper, SysJobLog>
+public class SysJobLogServiceImpl extends AbstractBaseService<SysJobLogMapper, SysJobLogEntity>
     implements YtSysJobLogService {
 
   @Override
@@ -34,14 +34,14 @@ public class SysJobLogServiceImpl extends AbstractBaseService<SysJobLogMapper, S
     String jobId = queryMap.get("jobId") != null ? queryMap.get("jobId").toString() : null;
     Integer status =
         queryMap.get("status") != null ? Integer.valueOf(queryMap.get("status").toString()) : null;
-    IPage<SysJobLog> sysJobLogIPage =
+    IPage<SysJobLogEntity> sysJobLogIPage =
         baseMapper.selectPage(
             getPage(queryMap, "start_time", false),
-            new LambdaQueryWrapper<SysJobLog>()
-                .eq(StringUtils.isNotEmpty(jobId), SysJobLog::getJobId, jobId)
-                .like(StringUtils.isNotEmpty(jobName), SysJobLog::getJobName, jobName)
-                .eq(StringUtils.isNotEmpty(jobGroup), SysJobLog::getJobGroup, jobGroup)
-                .eq(null != status, SysJobLog::getStatus, status));
+            new LambdaQueryWrapper<SysJobLogEntity>()
+                .eq(StringUtils.isNotEmpty(jobId), SysJobLogEntity::getJobId, jobId)
+                .like(StringUtils.isNotEmpty(jobName), SysJobLogEntity::getJobName, jobName)
+                .eq(StringUtils.isNotEmpty(jobGroup), SysJobLogEntity::getJobGroup, jobGroup)
+                .eq(null != status, SysJobLogEntity::getStatus, status));
     return getPageData(sysJobLogIPage, SysJobLogDTO.class);
   }
 
@@ -50,7 +50,7 @@ public class SysJobLogServiceImpl extends AbstractBaseService<SysJobLogMapper, S
     if (StringUtils.isEmpty(id)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    SysJobLog sysJobLog = baseMapper.selectById(id);
+    SysJobLogEntity sysJobLog = baseMapper.selectById(id);
     return Optional.ofNullable(sysJobLog)
         .map(
             obj -> {
@@ -69,11 +69,11 @@ public class SysJobLogServiceImpl extends AbstractBaseService<SysJobLogMapper, S
   @Override
   @Transactional
   public SysJobLogDTO saveOrUpdateSysJobLog(SysJobLogDTO jobLogDTO) {
-    SysJobLog jobLog = jobLogDTO.getEntity(SysJobLog.class);
+    SysJobLogEntity jobLog = jobLogDTO.getEntity(SysJobLogEntity.class);
     if (StringUtils.isEmpty(jobLogDTO.getId())) {
       baseMapper.insert(jobLog);
     } else {
-      SysJobLog sysJobLog = baseMapper.selectById(jobLogDTO.getId());
+      SysJobLogEntity sysJobLog = baseMapper.selectById(jobLogDTO.getId());
       Optional.ofNullable(sysJobLog)
           .map(job -> baseMapper.updateById(jobLog))
           .orElseThrow(

@@ -15,7 +15,7 @@ import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.util.yunteng.CronUtils;
 import org.thingsboard.server.dao.util.yunteng.ScheduleUtils;
-import org.thingsboard.server.dao.yunteng.entities.SysJob;
+import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysJobMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 
@@ -25,7 +25,7 @@ import java.util.*;
 /** 定时任务调度信息 服务层 */
 @Service
 @RequiredArgsConstructor
-public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
+public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobEntity>
     implements YtSysJobService {
   private final Scheduler scheduler;
 
@@ -33,10 +33,10 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   @PostConstruct
   public void init() throws SchedulerException {
     scheduler.clear();
-    List<SysJob> jobList =
+    List<SysJobEntity> jobList =
         baseMapper.selectList(
-            new LambdaQueryWrapper<SysJob>().eq(SysJob::getStatus, StatusEnum.ENABLE.getIndex()));
-    for (SysJob job : jobList) {
+            new LambdaQueryWrapper<SysJobEntity>().eq(SysJobEntity::getStatus, StatusEnum.ENABLE.getIndex()));
+    for (SysJobEntity job : jobList) {
       ScheduleUtils.createScheduleJob(scheduler, job);
     }
   }
@@ -47,13 +47,13 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
     String jobName = queryMap.get("jobName") != null ? queryMap.get("jobName").toString() : null;
     Integer status =
         queryMap.get("status") != null ? Integer.valueOf(queryMap.get("status").toString()) : null;
-    IPage<SysJob> sysJobIPage =
+    IPage<SysJobEntity> sysJobIPage =
         baseMapper.selectPage(
             getPage(queryMap, "create_time", false),
-            new LambdaQueryWrapper<SysJob>()
-                .like(StringUtils.isNotEmpty(jobName), SysJob::getJobName, jobName)
-                .eq(StringUtils.isNotEmpty(jobGroup), SysJob::getJobGroup, jobGroup)
-                .eq(null != status, SysJob::getStatus, status));
+            new LambdaQueryWrapper<SysJobEntity>()
+                .like(StringUtils.isNotEmpty(jobName), SysJobEntity::getJobName, jobName)
+                .eq(StringUtils.isNotEmpty(jobGroup), SysJobEntity::getJobGroup, jobGroup)
+                .eq(null != status, SysJobEntity::getStatus, status));
     return getPageData(sysJobIPage, SysJobDTO.class);
   }
 
@@ -67,7 +67,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   public SysJobDTO selectJobById(String id) {
 
     return Optional.ofNullable(
-            baseMapper.selectOne(new LambdaQueryWrapper<SysJob>().eq(SysJob::getId, id)))
+            baseMapper.selectOne(new LambdaQueryWrapper<SysJobEntity>().eq(SysJobEntity::getId, id)))
         .map(obj -> obj.getDTO(SysJobDTO.class))
         .orElseThrow(
             () -> {
@@ -86,7 +86,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   public SysJobDTO pauseJob(SysJobDTO job) throws SchedulerException {
     String jobGroup = job.getJobGroup();
     job.setStatus(StatusEnum.DISABLE.getIndex());
-    int rows = baseMapper.updateById(job.getEntity(SysJob.class));
+    int rows = baseMapper.updateById(job.getEntity(SysJobEntity.class));
     if (rows > 0) {
       scheduler.pauseJob(ScheduleUtils.getJobKey(job.getId(), jobGroup));
     }
@@ -103,7 +103,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   public SysJobDTO resumeJob(SysJobDTO job) throws SchedulerException {
     String jobGroup = job.getJobGroup();
     job.setStatus(StatusEnum.ENABLE.getIndex());
-    int rows = baseMapper.updateById(job.getEntity(SysJob.class));
+    int rows = baseMapper.updateById(job.getEntity(SysJobEntity.class));
     if (rows > 0) {
       scheduler.resumeJob(ScheduleUtils.getJobKey(job.getId(), jobGroup));
     }
@@ -136,7 +136,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   @Transactional(rollbackFor = Exception.class)
   public boolean deleteJobByIds(DeleteDTO deleteDTO) throws SchedulerException {
     for (String id : deleteDTO.getIds()) {
-      SysJob job = baseMapper.selectById(id);
+      SysJobEntity job = baseMapper.selectById(id);
       deleteJob(job.getDTO(SysJobDTO.class));
     }
     return true;
@@ -158,7 +158,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
       jobDTO = pauseJob(job);
     }
     if (null != jobDTO) {
-      baseMapper.updateById(jobDTO.getEntity(SysJob.class));
+      baseMapper.updateById(jobDTO.getEntity(SysJobEntity.class));
     }
     return jobDTO;
   }
@@ -172,7 +172,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   @Transactional(rollbackFor = Exception.class)
   public boolean run(SysJobDTO job) throws SchedulerException {
     boolean result = false;
-    SysJob tmpObj = baseMapper.selectById(job.getId());
+    SysJobEntity tmpObj = baseMapper.selectById(job.getId());
     // 参数
     JobDataMap dataMap = new JobDataMap();
     dataMap.put(FastIotConstants.ScheduleConstants.TASK_PROPERTIES, tmpObj);
@@ -193,12 +193,12 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   @Transactional(rollbackFor = Exception.class)
   public SysJobDTO saveOrUpdateJob(SysJobDTO jobDTO) throws SchedulerException {
     if (StringUtils.isEmpty(jobDTO.getId())) {
-      SysJob job = jobDTO.getEntity(SysJob.class);
+      SysJobEntity job = jobDTO.getEntity(SysJobEntity.class);
       baseMapper.insert(job);
       ScheduleUtils.createScheduleJob(scheduler, job);
     } else {
-      SysJob job = baseMapper.selectById(jobDTO.getId());
-      SysJob newJob = jobDTO.getEntity(SysJob.class);
+      SysJobEntity job = baseMapper.selectById(jobDTO.getId());
+      SysJobEntity newJob = jobDTO.getEntity(SysJobEntity.class);
       if (null == job) {
         throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }
@@ -216,7 +216,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
    * @param job 任务对象
    * @param jobGroup 任务组名
    */
-  private void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException {
+  private void updateSchedulerJob(SysJobEntity job, String jobGroup) throws SchedulerException {
     // 判断是否存在
     JobKey jobKey = ScheduleUtils.getJobKey(job.getId(), jobGroup);
     if (scheduler.checkExists(jobKey)) {
@@ -241,7 +241,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   public SysJobDTO findSysJobBySourceId(String sourceId) {
     return Optional.ofNullable(
             baseMapper.selectOne(
-                new LambdaQueryWrapper<SysJob>().eq(SysJob::getSourceId, sourceId)))
+                new LambdaQueryWrapper<SysJobEntity>().eq(SysJobEntity::getSourceId, sourceId)))
         .map(obj -> obj.getDTO(SysJobDTO.class))
         .orElse(null);
   }

@@ -9,7 +9,7 @@ import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.yunteng.dto.SysLogDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
-import org.thingsboard.server.dao.yunteng.mapper.YtSysLogMapper;
+import org.thingsboard.server.dao.yunteng.mapper.SysLogMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtSysLogService;
 
@@ -19,7 +19,7 @@ import java.util.List;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class YtSysLogServiceImpl extends AbstractBaseService<YtSysLogMapper, SysLogEntity>
+public class SysLogServiceImpl extends AbstractBaseService<SysLogMapper, SysLogEntity>
         implements YtSysLogService {
 
 

@@ -6,17 +6,15 @@ import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
 import org.springframework.security.access.AccessDeniedException;
 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.cache.CacheUtils;
 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.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.enums.MenuTypeEnum;
-import org.thingsboard.server.dao.yunteng.entities.Menu;
+import org.thingsboard.server.dao.yunteng.entities.SysMenuEntity;
 import org.thingsboard.server.dao.yunteng.mapper.MenuMapper;
 import org.thingsboard.server.dao.yunteng.mapper.RoleMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -27,7 +25,7 @@ import java.util.*;
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> implements MenuService {
+public class SysMenuServiceImpl extends AbstractBaseService<MenuMapper, SysMenuEntity> implements MenuService {
 
   private final RoleMapper roleMapper;
   private final CacheUtils cacheUtils;
@@ -35,8 +33,8 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
   @Override
   public List<MenuDTO> getAllMenus(String tenantId) {
 
-    List<Menu> menus =
-        baseMapper.selectList(new QueryWrapper<Menu>().lambda().eq(Menu::getTenantId, tenantId));
+    List<SysMenuEntity> menus =
+        baseMapper.selectList(new QueryWrapper<SysMenuEntity>().lambda().eq(SysMenuEntity::getTenantId, tenantId));
     Map<String, MenuDTO> menuDTOMap = new LinkedHashMap<>(menus.size());
     menus.forEach(menu -> menuDTOMap.put(menu.getId(), menu.getDTO(MenuDTO.class)));
     return buildMenuDTOTree(menuDTOMap,true);
@@ -97,12 +95,12 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
     }
     int count =
         baseMapper.selectCount(
-            new QueryWrapper<Menu>().lambda().eq(Menu::getPath, menuDTO.getPath()));
+            new QueryWrapper<SysMenuEntity>().lambda().eq(SysMenuEntity::getPath, menuDTO.getPath()));
     if (count > 0) {
       throw new YtDataValidationException("menu with path " + menuDTO + " already exist");
     }
     menuDTO.setTenantId(tenantId);
-    Menu menu = menuDTO.getEntity(Menu.class);
+    SysMenuEntity menu = menuDTO.getEntity(SysMenuEntity.class);
     int insertCount = baseMapper.insert(menu);
     if (insertCount > 0) {
       cacheUtils.invalidateCacheName(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY);
@@ -120,7 +118,7 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
   @Override
   @Transactional
   public MenuDTO updateMenu(String tenantId, boolean isSysAdmin, MenuDTO menuDTO) {
-    Menu oldMenu = baseMapper.selectById(menuDTO.getId());
+    SysMenuEntity oldMenu = baseMapper.selectById(menuDTO.getId());
     if (oldMenu == null) {
       throw new YtDataValidationException("cannot find menu to update");
     } else {
@@ -158,7 +156,7 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
   public boolean assignMenuToTenant(String tenantId, String[] menuId) {
     Set<String> ids = Set.of(menuId);
     int menuCountInDB =
-        baseMapper.selectCount(new QueryWrapper<Menu>().lambda().in(Menu::getId, ids));
+        baseMapper.selectCount(new QueryWrapper<SysMenuEntity>().lambda().in(SysMenuEntity::getId, ids));
     if (menuCountInDB != menuId.length) {
       throw new YtDataValidationException("please ensure all menu id are valid");
     }
@@ -185,7 +183,7 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
     Set<String> ids = Set.of(menuId);
     if (!ids.isEmpty()) {
       int menuCountInDB =
-          baseMapper.selectCount(new QueryWrapper<Menu>().lambda().in(Menu::getId, ids));
+          baseMapper.selectCount(new QueryWrapper<SysMenuEntity>().lambda().in(SysMenuEntity::getId, ids));
       if (menuCountInDB != menuId.length) {
         throw new YtDataValidationException("please ensure all menu id are valid");
       }

@@ -11,10 +11,9 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.EntityCreationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
-import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.SysNotice;
-import org.thingsboard.server.dao.yunteng.entities.User;
+import org.thingsboard.server.dao.yunteng.entities.SysNoticeEntity;
+import org.thingsboard.server.dao.yunteng.entities.SysUserEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysNoticeMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -34,7 +33,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, SysNotice>
+public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, SysNoticeEntity>
     implements SysNoticeService {
 
   private final SysNoticeUserServiceImpl sysNoticeUserService;
@@ -44,7 +43,7 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
 
   @Override
   public YtPageData<SysNoticeDTO> page(Map<String, Object> queryMap) {
-    IPage<SysNotice> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    IPage<SysNoticeEntity> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<SysNoticeDTO> pageDto = baseMapper.page(page, queryMap);
     return getPageData(pageDto, SysNoticeDTO.class);
   }
@@ -60,16 +59,16 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
     //删除前先删除通知用户
     sysNoticeUserService.deleteNoticUserByNoticeId(new ArrayList<>(ids));
     return baseMapper.delete(
-            new LambdaQueryWrapper<SysNotice>()
-                .in(SysNotice::getId, ids)
-                .eq(SysNotice::getTenantId, tenantId))
+            new LambdaQueryWrapper<SysNoticeEntity>()
+                .in(SysNoticeEntity::getId, ids)
+                .eq(SysNoticeEntity::getTenantId, tenantId))
         > 0;
   }
 
   @Override
   @Transactional
   public SysNoticeDTO save(SysNoticeDTO sysNoticeDTO, String tenantId) {
-    SysNotice sysNotice = sysNoticeDTO.getEntity(SysNotice.class);
+    SysNoticeEntity sysNotice = sysNoticeDTO.getEntity(SysNoticeEntity.class);
     // 设置为草稿
     sysNotice.setTenantId(tenantId);
     // 接收者字典值判断
@@ -85,9 +84,9 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
         userList =
             userMapper
                 .selectList(
-                    new LambdaQueryWrapper<User>().eq(User::getTenantId, sysNotice.getTenantId()))
+                    new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getTenantId, sysNotice.getTenantId()))
                 .stream()
-                .map(User::getId)
+                .map(SysUserEntity::getId)
                 .distinct()
                 .collect(Collectors.toList());
         break;
@@ -131,11 +130,11 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
   @Override
   @Transactional
   public SysNoticeDTO send(SysNoticeDTO sysNoticeDTO, String tenantId, String currentUserId) {
-    SysNotice sysNotice;
+    SysNoticeEntity sysNotice;
     // 如果通知为空,则新增
-    sysNotice = save(sysNoticeDTO, tenantId).getEntity(SysNotice.class);
+    sysNotice = save(sysNoticeDTO, tenantId).getEntity(SysNoticeEntity.class);
     //获取当前发送者
-    User user = userMapper.selectById(currentUserId);
+    SysUserEntity user = userMapper.selectById(currentUserId);
     if (null != user) {
       sysNotice.setSenderName(user.getRealName());
       sysNotice.setAvatar(user.getAvatar());
@@ -144,9 +143,9 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
     sysNotice.setSenderDate(LocalDateTime.now());
     baseMapper.update(
             sysNotice,
-            new LambdaQueryWrapper<SysNotice>()
-                .eq(SysNotice::getId, sysNoticeDTO.getId())
-                .eq(SysNotice::getTenantId, tenantId));
+            new LambdaQueryWrapper<SysNoticeEntity>()
+                .eq(SysNoticeEntity::getId, sysNoticeDTO.getId())
+                .eq(SysNoticeEntity::getTenantId, tenantId));
     return sysNotice.getDTO(SysNoticeDTO.class);
   }
 }

@@ -3,7 +3,6 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -12,8 +11,8 @@ import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.SysNoticeUser;
-import org.thingsboard.server.dao.yunteng.entities.User;
+import org.thingsboard.server.dao.yunteng.entities.SysNoticeUserEntity;
+import org.thingsboard.server.dao.yunteng.entities.SysUserEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysNoticeUserMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -33,7 +32,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class SysNoticeUserServiceImpl
-        extends AbstractBaseService<SysNoticeUserMapper, SysNoticeUser>
+        extends AbstractBaseService<SysNoticeUserMapper, SysNoticeUserEntity>
         implements SysNoticeUserService {
     private final UserMapper userMapper;
 
@@ -55,7 +54,7 @@ public class SysNoticeUserServiceImpl
 
     @Override
     public SysNoticeUserDTO get(String id, String tenantId) {
-        SysNoticeUser sysNoticeUser = baseMapper.get(id, tenantId).getEntity(SysNoticeUser.class);
+        SysNoticeUserEntity sysNoticeUser = baseMapper.get(id, tenantId).getEntity(SysNoticeUserEntity.class);
         if (!FastIotConstants.ReadState.READ.equals(sysNoticeUser.getReadStatus())
                 || sysNoticeUser.getReadDate() == null) {
             // 设置已读
@@ -63,10 +62,10 @@ public class SysNoticeUserServiceImpl
             sysNoticeUser.setReadDate(LocalDateTime.now());
             baseMapper.update(
                     null,
-                    new LambdaUpdateWrapper<SysNoticeUser>()
-                            .eq(SysNoticeUser::getId, sysNoticeUser.getId())
-                            .set(SysNoticeUser::getReadStatus, sysNoticeUser.getReadStatus())
-                            .set(SysNoticeUser::getReadDate, sysNoticeUser.getReadDate()));
+                    new LambdaUpdateWrapper<SysNoticeUserEntity>()
+                            .eq(SysNoticeUserEntity::getId, sysNoticeUser.getId())
+                            .set(SysNoticeUserEntity::getReadStatus, sysNoticeUser.getReadStatus())
+                            .set(SysNoticeUserEntity::getReadDate, sysNoticeUser.getReadDate()));
         }
         return sysNoticeUser.getDTO(SysNoticeUserDTO.class);
     }
@@ -74,15 +73,15 @@ public class SysNoticeUserServiceImpl
     @Override
     public void saveSysNoticeUser(
             List<String> userIds, String tenantId, String noticeId, Integer status) {
-        List<User> userList = userMapper
+        List<SysUserEntity> userList = userMapper
                 .selectList(
-                        new LambdaQueryWrapper<User>().in(User::getId, userIds))
+                        new LambdaQueryWrapper<SysUserEntity>().in(SysUserEntity::getId, userIds))
                 .stream()
                 .collect(Collectors.toList());
-        List<SysNoticeUser> sysNoticeUserList = new ArrayList<>();
+        List<SysNoticeUserEntity> sysNoticeUserList = new ArrayList<>();
         userList.forEach(
                 user -> {
-                    SysNoticeUser sysNoticeUser = new SysNoticeUser();
+                    SysNoticeUserEntity sysNoticeUser = new SysNoticeUserEntity();
                     sysNoticeUser.setNoticeId(noticeId);
                     sysNoticeUser.setStatus(status);
                     sysNoticeUser.setTenantId(tenantId);
@@ -101,9 +100,9 @@ public class SysNoticeUserServiceImpl
         }
         return baseMapper
                 .selectList(
-                        new LambdaQueryWrapper<SysNoticeUser>().eq(SysNoticeUser::getNoticeId, noticeId))
+                        new LambdaQueryWrapper<SysNoticeUserEntity>().eq(SysNoticeUserEntity::getNoticeId, noticeId))
                 .stream()
-                .map(SysNoticeUser::getId)
+                .map(SysNoticeUserEntity::getId)
                 .collect(Collectors.toList());
     }
 
@@ -119,12 +118,12 @@ public class SysNoticeUserServiceImpl
     public boolean deleteNoticUserByNoticeId(List<String> noticeId) {
 
         return baseMapper.delete(
-                new LambdaQueryWrapper<SysNoticeUser>().in(SysNoticeUser::getNoticeId, noticeId))
+                new LambdaQueryWrapper<SysNoticeUserEntity>().in(SysNoticeUserEntity::getNoticeId, noticeId))
                 > 0;
     }
 
     private YtPageData<SysNoticeUserDTO> getPage(Map<String, Object> queryMap) {
-        IPage<SysNoticeUser> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+        IPage<SysNoticeUserEntity> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         IPage<SysNoticeUserDTO> pageDto = baseMapper.page(page, queryMap);
         return getPageData(pageDto, SysNoticeUserDTO.class);
     }

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
-import org.thingsboard.server.dao.yunteng.entities.SysPlatformDesign;
+import org.thingsboard.server.dao.yunteng.entities.SysPlatformDesignEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysPlatformDesignMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
@@ -20,21 +20,21 @@ import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
 @Service
 @RequiredArgsConstructor
 public class SysPlatformDesignServiceImpl
-    extends AbstractBaseService<SysPlatformDesignMapper, SysPlatformDesign>
+    extends AbstractBaseService<SysPlatformDesignMapper, SysPlatformDesignEntity>
     implements SysPlatformDesignService {
   @Override
   public boolean save(SysPlatformDesignDTO sysAppDesignDTO, String tenantId) {
-    SysPlatformDesign entity = sysAppDesignDTO.getEntity(SysPlatformDesign.class);
+    SysPlatformDesignEntity entity = sysAppDesignDTO.getEntity(SysPlatformDesignEntity.class);
     entity.setTenantId(tenantId);
     return baseMapper.insert(entity) > 0;
   }
 
   @Override
   public SysPlatformDesignDTO get(String tenantId) {
-    SysPlatformDesign sysPlatformDesign =
+    SysPlatformDesignEntity sysPlatformDesign =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<SysPlatformDesign>()
-                .eq(SysPlatformDesign::getTenantId, tenantId));
+            new LambdaQueryWrapper<SysPlatformDesignEntity>()
+                .eq(SysPlatformDesignEntity::getTenantId, tenantId));
     return sysPlatformDesign == null ? null : sysPlatformDesign.getDTO(SysPlatformDesignDTO.class);
   }
 
@@ -42,9 +42,9 @@ public class SysPlatformDesignServiceImpl
   public boolean update(SysPlatformDesignDTO sysAppDesignDTO, String tenantId) {
     if (get(tenantId) != null) {
       return baseMapper.update(
-              sysAppDesignDTO.getEntity(SysPlatformDesign.class),
-              new LambdaQueryWrapper<SysPlatformDesign>()
-                  .eq(SysPlatformDesign::getTenantId, tenantId))
+              sysAppDesignDTO.getEntity(SysPlatformDesignEntity.class),
+              new LambdaQueryWrapper<SysPlatformDesignEntity>()
+                  .eq(SysPlatformDesignEntity::getTenantId, tenantId))
           > 0;
     } else {
       return save(sysAppDesignDTO, tenantId);
@@ -54,8 +54,8 @@ public class SysPlatformDesignServiceImpl
   @Override
   public boolean factoryDataReset(String tenantId) {
     return baseMapper.delete(
-            new LambdaQueryWrapper<SysPlatformDesign>()
-                .eq(SysPlatformDesign::getTenantId, tenantId))
+            new LambdaQueryWrapper<SysPlatformDesignEntity>()
+                .eq(SysPlatformDesignEntity::getTenantId, tenantId))
         > FastIotConstants.MagicNumber.ZERO;
   }
 }

@@ -18,10 +18,10 @@ import org.thingsboard.server.common.data.yunteng.dto.RoleDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.RoleReqDTO;
 import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.Role;
-import org.thingsboard.server.dao.yunteng.entities.TenantMenu;
-import org.thingsboard.server.dao.yunteng.entities.TenantRole;
-import org.thingsboard.server.dao.yunteng.entities.UserRole;
+import org.thingsboard.server.dao.yunteng.entities.SysRoleEntity;
+import org.thingsboard.server.dao.yunteng.entities.SysTenantMenuEntity;
+import org.thingsboard.server.dao.yunteng.entities.SysTenantRoleEntity;
+import org.thingsboard.server.dao.yunteng.entities.SysUserRoleEntity;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> implements RoleService {
+public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleEntity> implements RoleService {
 
     private final MenuMapper menuMapper;
     private final CacheUtils cacheUtils;
@@ -44,18 +44,18 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
 
     @Override
     public YtPageData<RoleDTO> page(String tenantId, Map<String, Object> queryMap) {
-        IPage<Role> roleIPage =
+        IPage<SysRoleEntity> roleIPage =
                 baseMapper.selectPage(
                         getPage(queryMap, "create_time", false),
-                        new QueryWrapper<Role>()
+                        new QueryWrapper<SysRoleEntity>()
                                 .lambda()
-                                .eq(queryMap.get("status") != null, Role::isEnabled, queryMap.get("status"))
-                                .eq(queryMap.get("roleType") != null, Role::getRoleType, queryMap.get("roleType"))
-                                .ne(queryMap.get("roleType") == null, Role::getRoleType, RoleEnum.TENANT_ADMIN.name())
-                                .eq(Role::getTenantId, tenantId)
+                                .eq(queryMap.get("status") != null, SysRoleEntity::isEnabled, queryMap.get("status"))
+                                .eq(queryMap.get("roleType") != null, SysRoleEntity::getRoleType, queryMap.get("roleType"))
+                                .ne(queryMap.get("roleType") == null, SysRoleEntity::getRoleType, RoleEnum.TENANT_ADMIN.name())
+                                .eq(SysRoleEntity::getTenantId, tenantId)
                                 .like(
                                         queryMap.get("roleName") != null,
-                                        Role::getName,
+                                        SysRoleEntity::getName,
                                         String.valueOf(queryMap.get("roleName"))));
         return getPageData(roleIPage, RoleDTO.class);
     }
@@ -66,7 +66,7 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
         Set<String> ids = Set.of(roleIds);
         int notTenantMenuCount =
                 baseMapper.selectCount(
-                        new QueryWrapper<Role>().lambda().ne(Role::getTenantId, tenantId).in(Role::getId, ids));
+                        new QueryWrapper<SysRoleEntity>().lambda().ne(SysRoleEntity::getTenantId, tenantId).in(SysRoleEntity::getId, ids));
         if (notTenantMenuCount > 0) {
             throw new AccessDeniedException("只能删除自己创建的角色");
         }
@@ -127,10 +127,10 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
     public void updateRoleStatus(String roleId, int status, boolean isSysadmin, String tenantId) {
         Optional.ofNullable(
                         baseMapper.selectOne(
-                                new QueryWrapper<Role>()
+                                new QueryWrapper<SysRoleEntity>()
                                         .lambda()
-                                        .eq(Role::getId, roleId)
-                                        .eq(!isSysadmin, Role::getTenantId, tenantId)))
+                                        .eq(SysRoleEntity::getId, roleId)
+                                        .eq(!isSysadmin, SysRoleEntity::getTenantId, tenantId)))
                 .ifPresent(
                         role -> {
                             role.setEnabled(status == 1);
@@ -142,7 +142,7 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
     @Transactional
     public RoleDTO saveOrUpdateRoleInfoWithMenu(
             RoleReqDTO roleReqDTO, boolean isSysadmin, boolean isPlatformAdmin, String tenantId) {
-        Role role;
+        SysRoleEntity role;
         // 默认普通管理员角色,即租户管理员添加的角色
         var roleType = RoleEnum.CUSTOMER_USER.name();
         if (null != roleReqDTO.getRoleType()) {
@@ -157,10 +157,10 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
             // do update
             role =
                     baseMapper.selectOne(
-                            new QueryWrapper<Role>()
+                            new QueryWrapper<SysRoleEntity>()
                                     .lambda()
-                                    .eq(Role::getId, roleReqDTO.getId())
-                                    .eq(!isSysadmin, Role::getTenantId, tenantId));
+                                    .eq(SysRoleEntity::getId, roleReqDTO.getId())
+                                    .eq(!isSysadmin, SysRoleEntity::getTenantId, tenantId));
             if (role == null) {
                 return null;
             } else {
@@ -171,7 +171,7 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
             }
         } else {
             // do save
-            role = new Role();
+            role = new SysRoleEntity();
             role.setRoleType(roleType);
             role.setCode(RandomStringUtils.randomAlphabetic(10));
             role.setRemark(roleReqDTO.getRemark());
@@ -199,9 +199,9 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
             // 1、查询这个角色有几个租户用户
             // 2、删除并更新对应租户的信息
             // 3、超级管理员删除租户角色菜单时，同步删除租户内客户角色的权限，租户ID+菜单ID
-            List<TenantRole> tenantRoles =
+            List<SysTenantRoleEntity> tenantRoles =
                     tenantRoleMapper.selectList(
-                            new QueryWrapper<TenantRole>().lambda().eq(TenantRole::getRoleId, role.getId()));
+                            new QueryWrapper<SysTenantRoleEntity>().lambda().eq(SysTenantRoleEntity::getRoleId, role.getId()));
             tenantRoles.forEach(
                     tenantRole -> {
                         String updateTenantId = tenantRole.getTenantId();
@@ -209,21 +209,21 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
                         if(!removeMenus.isEmpty()){
                             //刷新租户的菜单
                             tenantMenuMapper.delete(
-                                    new QueryWrapper<TenantMenu>()
+                                    new QueryWrapper<SysTenantMenuEntity>()
                                             .lambda()
-                                            .eq(TenantMenu::getTenantId, updateTenantId)
-                                            .in(TenantMenu::getMenuId,removeMenus));
+                                            .eq(SysTenantMenuEntity::getTenantId, updateTenantId)
+                                            .in(SysTenantMenuEntity::getMenuId,removeMenus));
                             //刷新客户的菜单
-                            List<Role> customerRoles = baseMapper.selectList(
-                                    new QueryWrapper<Role>()
+                            List<SysRoleEntity> customerRoles = baseMapper.selectList(
+                                    new QueryWrapper<SysRoleEntity>()
                                             .lambda()
-                                            .eq(Role::getTenantId, updateTenantId)
-                                            .eq(Role::getRoleType,RoleEnum.CUSTOMER_USER.name()));
+                                            .eq(SysRoleEntity::getTenantId, updateTenantId)
+                                            .eq(SysRoleEntity::getRoleType,RoleEnum.CUSTOMER_USER.name()));
                             customerRoles.forEach(cr -> menuMapper.removeMenuFromRole(cr.getId(),removeMenus));
                         }
                         newMenus.forEach(
                                 menu -> {
-                                    TenantMenu tenantMenu = new TenantMenu();
+                                    SysTenantMenuEntity tenantMenu = new SysTenantMenuEntity();
                                     tenantMenu.setMenuId(menu);
                                     tenantMenu.setTenantId(updateTenantId);
                                     tenantMenuMapper.insert(tenantMenu);
@@ -245,9 +245,9 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
             // 租户管理员既要查询自己拥有的角色，也要查询自己创建的角色
             List<String> roleIds =
                     userRoleMapper
-                            .selectList(new QueryWrapper<UserRole>().lambda().eq(UserRole::getUserId, userId))
+                            .selectList(new QueryWrapper<SysUserRoleEntity>().lambda().eq(SysUserRoleEntity::getUserId, userId))
                             .stream()
-                            .map(UserRole::getRoleId)
+                            .map(SysUserRoleEntity::getRoleId)
                             .collect(Collectors.toList());
             roleDTO.setRoleIds(roleIds.toArray(new String[roleIds.size()]));
         }

@@ -12,7 +12,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
-import org.thingsboard.server.dao.yunteng.entities.UserOrganizationMapping;
+import org.thingsboard.server.dao.yunteng.entities.TkUserOrganizationMappingEntity;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserOrganizationMappingMapper;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class UserOrganizationMappingServiceImpl implements UserOrganizationMappingService {
+public class SysUserOrganizationMappingServiceImpl implements UserOrganizationMappingService {
 
   private final UserOrganizationMappingMapper userOrganizationMappingMapper;
   private final OrganizationMapper organizationMapper;
@@ -49,10 +49,10 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
       clearList.addAll(collect);
       return userOrganizationMappingMapper
           .selectList(
-              new LambdaQueryWrapper<UserOrganizationMapping>()
-                  .in(UserOrganizationMapping::getOrganizationId, clearList))
+              new LambdaQueryWrapper<TkUserOrganizationMappingEntity>()
+                  .in(TkUserOrganizationMappingEntity::getOrganizationId, clearList))
           .stream()
-          .map(UserOrganizationMapping::getUserId)
+          .map(TkUserOrganizationMappingEntity::getUserId)
           .distinct()
           .collect(Collectors.toList());
     }
@@ -68,8 +68,8 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
     if (isUpdate) {
       // 先删除,再新增
       userOrganizationMappingMapper.delete(
-          new LambdaQueryWrapper<UserOrganizationMapping>()
-              .eq(UserOrganizationMapping::getUserId, userId));
+          new LambdaQueryWrapper<TkUserOrganizationMappingEntity>()
+              .eq(TkUserOrganizationMappingEntity::getUserId, userId));
     }
     batchInsert(userId, organizationIds);
   }
@@ -81,18 +81,18 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
     }
     return userOrganizationMappingMapper
         .selectList(
-            new QueryWrapper<UserOrganizationMapping>()
+            new QueryWrapper<TkUserOrganizationMappingEntity>()
                 .lambda()
-                .eq(UserOrganizationMapping::getUserId, userId))
+                .eq(TkUserOrganizationMappingEntity::getUserId, userId))
         .stream()
-        .map(UserOrganizationMapping::getOrganizationId)
+        .map(TkUserOrganizationMappingEntity::getOrganizationId)
         .collect(Collectors.toList());
   }
 
   private void batchInsert(String userId, List<String> organizationIds) {
     organizationIds.forEach(
         organizationId -> {
-          UserOrganizationMapping userOrganizationMapping = new UserOrganizationMapping();
+          TkUserOrganizationMappingEntity userOrganizationMapping = new TkUserOrganizationMappingEntity();
           userOrganizationMapping.setUserId(userId);
           userOrganizationMapping.setOrganizationId(organizationId);
           userOrganizationMappingMapper.insert(userOrganizationMapping);

@@ -57,7 +57,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.ModelConstants
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
+public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserEntity>
     implements YtUserService {
 
   private final AdminSettingMapper adminSettingMapper;
@@ -102,7 +102,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       throw new YtDataValidationException(
           "you must specify user email if you want send activate email to this user");
     }
-    User user = new User();
+    SysUserEntity user = new SysUserEntity();
     userDTO.copyToEntity(user, ID, CREATE_TIME, UPDATE_TIME, TENANT_CODE, ACTIVATE_TOKEN);
     boolean userExist;
     if (StringUtils.isNotBlank(userDTO.getPassword())) {
@@ -112,10 +112,10 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     }
     userExist =
         baseMapper.selectCount(
-                new QueryWrapper<User>()
+                new QueryWrapper<SysUserEntity>()
                     .lambda()
-                    .eq(User::getUsername, userDTO.getUsername())
-                    .eq(User::getTenantId, tenantId))
+                    .eq(SysUserEntity::getUsername, userDTO.getUsername())
+                    .eq(SysUserEntity::getTenantId, tenantId))
             > 0;
     if (userExist) {
       throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
@@ -128,7 +128,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       baseMapper.insert(user);
       for (String roleId : userDTO.getRoleIds()) {
         // 添加用户角色信息
-        UserRole userRole = new UserRole();
+        SysUserRoleEntity userRole = new SysUserRoleEntity();
         userRole.setUserId(user.getId());
         userRole.setRoleId(roleId);
         userRoleMapper.insert(userRole);
@@ -144,9 +144,9 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   public void validateUserNameAndPhoneNumberAndEmail(UserDTO userDTO) {
     if (null == userDTO.getId()) {
-      User existUser =
+      SysUserEntity existUser =
           baseMapper.selectOne(
-              new LambdaQueryWrapper<User>().eq(User::getUsername, userDTO.getUsername()));
+              new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getUsername, userDTO.getUsername()));
       if (null != existUser) {
         throw new YtDataValidationException(ErrorMessage.USER_NAME_ALREADY_EXISTS.getMessage());
       }
@@ -167,7 +167,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     }
     boolean needCheck = true;
     if (null != userDTO.getId()) {
-      User user = baseMapper.selectById(userDTO.getId());
+      SysUserEntity user = baseMapper.selectById(userDTO.getId());
       if (user.getPhoneNumber().equals(userDTO.getPhoneNumber())
           && user.getEmail() != null
           && user.getEmail().equals(userDTO.getEmail())) {
@@ -175,20 +175,20 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       }
     }
     if (needCheck) {
-      LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+      LambdaQueryWrapper<SysUserEntity> queryWrapper = new LambdaQueryWrapper<>();
       if (null != userDTO.getId()) {
-        queryWrapper.ne(User::getId, userDTO.getId());
+        queryWrapper.ne(SysUserEntity::getId, userDTO.getId());
       }
       queryWrapper.and(
           userLambdaQueryWrapper -> {
-            userLambdaQueryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
+            userLambdaQueryWrapper.eq(SysUserEntity::getPhoneNumber, userDTO.getPhoneNumber());
             userLambdaQueryWrapper.or(
                 StringUtils.isNotEmpty(userDTO.getEmail()),
                 (userQueryWrapper -> {
-                  userQueryWrapper.eq(User::getEmail, userDTO.getEmail());
+                  userQueryWrapper.eq(SysUserEntity::getEmail, userDTO.getEmail());
                 }));
           });
-      List<User> existPhoneOrEmail = baseMapper.selectList(queryWrapper);
+      List<SysUserEntity> existPhoneOrEmail = baseMapper.selectList(queryWrapper);
       if (null != existPhoneOrEmail && existPhoneOrEmail.size() > 0) {
         throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage());
       }
@@ -200,13 +200,13 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (StringUtils.isEmpty(id)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    User user = baseMapper.selectById(id);
+    SysUserEntity user = baseMapper.selectById(id);
     return null !=user?user.getDTO(UserDTO.class):null;
   }
 
   @Override
   public String getActivationLink(String userId, boolean isPtSysadmin, String tenantId) {
-    User user = baseMapper.selectById(userId);
+    SysUserEntity user = baseMapper.selectById(userId);
     if (!isPtSysadmin && tenantId.equals(user.getTenantId())) {
       throw new AccessDeniedException(
           "you don't have permission to get activation link for this user");
@@ -215,12 +215,12 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       throw new YtDataValidationException("user already activated");
     }
     try {
-      List<AdminSetting> generalSetting =
+      List<SysAdminSettingEntity> generalSetting =
           adminSettingMapper.selectList(
-              new QueryWrapper<AdminSetting>()
+              new QueryWrapper<SysAdminSettingEntity>()
                   .lambda()
-                  .eq(AdminSetting::getKey, ModelConstants.AdminSettingConfigKey.GENERAL_SETTING));
-      AdminSetting adminSetting = generalSetting.get(0);
+                  .eq(SysAdminSettingEntity::getKey, ModelConstants.AdminSettingConfigKey.GENERAL_SETTING));
+      SysAdminSettingEntity adminSetting = generalSetting.get(0);
       JsonNode configNode = mapper.readTree(adminSetting.getConfigJson());
       String baseUrl = configNode.get(FastIotConstants.ConfigJSONKey.BASE_URL).asText();
       return String.format(ACTIVATE_URL_PATTERN, baseUrl, user.getActivateToken());
@@ -231,14 +231,14 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
 
   @Override
   public UserInfoDTO me(String userId, String tenantId, Set<String> currentRoles) {
-    User user = baseMapper.selectById(userId);
+    SysUserEntity user = baseMapper.selectById(userId);
     UserInfoDTO userInfoDTO = new UserInfoDTO();
     if (!accountProperties.getReset() || !StringUtils.isEmpty(user.getActivateToken())) {
       userInfoDTO.setNeedSetPwd(false);
     }
     AtomicReference<LocalDateTime> expireTime = new AtomicReference<>(user.getAccountExpireTime());
     if(expireTime.get() == null){
-      Tenant tenant =tenantMapper.selectOne(new QueryWrapper<Tenant>().lambda().eq(Tenant::getTenantId,tenantId));
+      SysTenantEntity tenant =tenantMapper.selectOne(new QueryWrapper<SysTenantEntity>().lambda().eq(SysTenantEntity::getTenantId,tenantId));
       Optional.ofNullable(tenant).ifPresent(i -> {
         expireTime.set(i.getTenantExpireTime());});
     }
@@ -252,7 +252,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     userInfoDTO.setEmail(user.getEmail());
     userInfoDTO.setTenantId(tenantId);
     userInfoDTO.setRoles(currentRoles);
-    Set<Role> roles = roleMapper.selectRoleByUserId(userId);
+    Set<SysRoleEntity> roles = roleMapper.selectRoleByUserId(userId);
     Set<PlainRolesDTO> plainRolesDTOSet = Sets.newHashSet();
     roles.forEach(
         role -> {
@@ -267,7 +267,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
 
   @Override
   public Optional<UserDTO> getUser(String userId, boolean isPtSysadmin, String tenantId) {
-    User user = baseMapper.selectById(userId);
+    SysUserEntity user = baseMapper.selectById(userId);
     if (user != null) {
       UserDTO userDTO = new UserDTO();
       user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
@@ -283,7 +283,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   @Transactional
   public UserDTO updateUser(UserDTO userDTO, boolean isPtSysadmin, String tenantId) {
-    User user = baseMapper.selectById(userDTO.getId());
+    SysUserEntity user = baseMapper.selectById(userDTO.getId());
     if (!isPtSysadmin && !user.getTenantId().equals(tenantId)) {
       throw new NoneTenantAssetException(ErrorMessage.NOT_BELONG_CURRENT_TENANT);
     }
@@ -316,7 +316,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       Map<String, Object> queryMap, boolean isPtSysadmin, boolean isTenantAdmin) {
     String tenantId = (String) queryMap.get("tenantId");
     IPage<UserDTO> userPage = null;
-    IPage<User> userIPage = getPage(queryMap, "create_time", false);
+    IPage<SysUserEntity> userIPage = getPage(queryMap, "create_time", false);
     String organizationId =
         queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
     List<String> userIds = null;
@@ -376,10 +376,10 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (!isPtSysadmin) {
       int notTenantUserCount =
           baseMapper.selectCount(
-              new QueryWrapper<User>()
+              new QueryWrapper<SysUserEntity>()
                   .lambda()
-                  .ne(User::getTenantId, tenantId)
-                  .in(User::getId, userIds));
+                  .ne(SysUserEntity::getTenantId, tenantId)
+                  .in(SysUserEntity::getId, userIds));
       if (notTenantUserCount > 0) {
         throw new AccessDeniedException("cannot delete user that not belong to your tenant");
       }
@@ -395,9 +395,9 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     baseMapper.deleteBatchIds(userIds);
 
     // 5、删除场景联动
-    Wrapper filter = new QueryWrapper<SceneLinkage>().lambda()
-                    .in(SceneLinkage::getCreator,userIds);
-    List<SceneLinkage> sceneLinkages =sceneLinkageMapper.selectList(filter);
+    Wrapper filter = new QueryWrapper<TkSceneLinkageEntity>().lambda()
+                    .in(TkSceneLinkageEntity::getCreator,userIds);
+    List<TkSceneLinkageEntity> sceneLinkages =sceneLinkageMapper.selectList(filter);
     if(sceneLinkages ==null || sceneLinkages.isEmpty()){
       return true;
     }
@@ -417,19 +417,19 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (StringUtils.isNotBlank(userDTO.getId())) {
       return updateUser(userDTO, isPtSysadmin, tenantId);
     }
-    User user = new User();
+    SysUserEntity user = new SysUserEntity();
     userDTO.copyToEntity(user, ID, PASSWORD, CREATE_TIME, UPDATE_TIME, ACTIVATE_TOKEN);
     user.setPassword(passwordEncoder.encode(accountProperties.getDefaultPassword()));
     user.setLevel(FastIotConstants.LevelValue.IS_TENANT_ADMIN);
-    List<User> users =
+    List<SysUserEntity> users =
         baseMapper.selectList(
-            new QueryWrapper<User>().lambda().eq(User::getUsername, userDTO.getUsername()));
+            new QueryWrapper<SysUserEntity>().lambda().eq(SysUserEntity::getUsername, userDTO.getUsername()));
     if (!users.isEmpty()) {
       throw new YtDataValidationException("用户已存在");
     }
     baseMapper.insert(user);
-    List<TenantRole> tenantRoleList =validateTenantRole(userDTO.getTenantId()) ;
-    for (TenantRole tenantRole : tenantRoleList) {
+    List<SysTenantRoleEntity> tenantRoleList =validateTenantRole(userDTO.getTenantId()) ;
+    for (SysTenantRoleEntity tenantRole : tenantRoleList) {
       roleMapper.saveUserRoleMapping(user.getId(), tenantRole.getRoleId());
     }
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
@@ -437,12 +437,12 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
 
   @Override
-  public List<TenantRole> validateTenantRole(String tenantId) {
-    List<TenantRole> tenantRoleList =
+  public List<SysTenantRoleEntity> validateTenantRole(String tenantId) {
+    List<SysTenantRoleEntity> tenantRoleList =
             tenantRoleMapper.selectList(
-                    new QueryWrapper<TenantRole>()
+                    new QueryWrapper<SysTenantRoleEntity>()
                             .lambda()
-                            .eq(TenantRole::getTenantId, tenantId));
+                            .eq(SysTenantRoleEntity::getTenantId, tenantId));
     // 保存用户与角色的映射信息
     if (null == tenantRoleList || tenantRoleList.size() == 0) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
@@ -459,7 +459,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     }
     userDTO.setPassword(passwordEncoder.encode(password));
     userDTO.setActivateToken(null);
-    baseMapper.updateById(userDTO.getEntity(User.class));
+    baseMapper.updateById(userDTO.getEntity(SysUserEntity.class));
   }
 
   @Override
@@ -491,9 +491,9 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
 
-    User user =
+    SysUserEntity user =
         baseMapper.selectOne(
-            new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber));
+            new QueryWrapper<SysUserEntity>().lambda().eq(SysUserEntity::getPhoneNumber, phoneNumber));
 
     if(StringUtils.isNotBlank(user.getTbUser())){
       UserId userId = new UserId(UUID.fromString(user.getTbUser()));
@@ -519,7 +519,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   public void sendRestPasswordMsg(String tenantId,SendResetPasswordEmailMsg msg) {
     // 通过用户ID查询用户信息
-    User user = baseMapper.selectById(msg.getUserId());
+    SysUserEntity user = baseMapper.selectById(msg.getUserId());
     if (null == user) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
@@ -551,12 +551,12 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   public Optional<List<UserDTO>> getOrganizationUserByOrganizationId(
       String groupId, String tenantId) {
-    Organization group = organizationMapper.selectById(groupId);
+    TkOrganizationEntity group = organizationMapper.selectById(groupId);
     if (group == null || !group.getTenantId().equals(tenantId)) {
       return Optional.empty();
     }
     List<String> userIds = userOrganizationMappingService.getUserIdByOrganizationIds(group.getId());
-    List<User> users = baseMapper.selectBatchIds(userIds);
+    List<SysUserEntity> users = baseMapper.selectBatchIds(userIds);
     return Optional.ofNullable(ReflectUtils.sourceToTarget(users, UserDTO.class));
   }
 
@@ -569,12 +569,12 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (roleOrGroupReqDTO.isQueryRole()) {
       List<String> roleIds =
           userRoleMapper
-              .selectList(new QueryWrapper<UserRole>().lambda().eq(UserRole::getUserId, userId))
+              .selectList(new QueryWrapper<SysUserRoleEntity>().lambda().eq(SysUserRoleEntity::getUserId, userId))
               .stream()
-              .map(UserRole::getRoleId)
+              .map(SysUserRoleEntity::getRoleId)
               .collect(Collectors.toList());
-      List<String> enableRoles = roleMapper.selectList(new QueryWrapper<Role>().lambda()
-                      .eq(Role::isEnabled, true).in(Role::getId,roleIds))
+      List<String> enableRoles = roleMapper.selectList(new QueryWrapper<SysRoleEntity>().lambda()
+                      .eq(SysRoleEntity::isEnabled, true).in(SysRoleEntity::getId,roleIds))
               .stream().map(m -> m.getId())
               .collect(Collectors.toList());
       if(enableRoles.size() == 0){
@@ -592,7 +592,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
 
   @Override
   @Transactional
-  public boolean changePassword(User user) {
+  public boolean changePassword(SysUserEntity user) {
     // 修改密码
     user.setPassword(passwordEncoder.encode(user.getPassword()));
     user.setActivateToken(RandomStringUtils.randomAlphabetic(10));
@@ -613,7 +613,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
 
   @Override
   public UserDTO updatePersonalCenter(UserDTO userDTO) {
-    User user = baseMapper.selectById(userDTO.getId());
+    SysUserEntity user = baseMapper.selectById(userDTO.getId());
     user.setRealName(userDTO.getRealName());
     user.setEmail(userDTO.getEmail());
     user.setAvatar(userDTO.getAvatar());
@@ -652,9 +652,9 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
 
   @Override
   public UserDTO checkAccount(String userId, Integer level) {
-    User user =
+    SysUserEntity user =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<User>().eq(User::getId, userId).eq(User::getLevel, level));
+            new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getId, userId).eq(SysUserEntity::getLevel, level));
     return null != user ? user.getDTO(UserDTO.class) : null;
   }
 
@@ -686,13 +686,13 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
 
   @Override
-  public User validateChangePasswordAccount(AccountReqDTO accountReqDTO) {
-    User user = baseMapper.selectById(accountReqDTO.getUserId());
+  public SysUserEntity validateChangePasswordAccount(AccountReqDTO accountReqDTO) {
+    SysUserEntity user = baseMapper.selectById(accountReqDTO.getUserId());
     checkPassword(accountReqDTO, user);
     return user;
   }
 
-  private void checkPassword(AccountReqDTO accountReqDTO, User user) {
+  private void checkPassword(AccountReqDTO accountReqDTO, SysUserEntity user) {
     if (null == user
         || StringUtils.isEmpty(accountReqDTO.getPassword())
         || StringUtils.isEmpty(accountReqDTO.getResetPassword())) {

@@ -14,11 +14,12 @@ 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.DataTypeEnum;
 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.entities.TkThingsModelEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ThingsModelMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
@@ -30,7 +31,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class ThingsModelServiceImpl
-    extends AbstractBaseService<ThingsModelMapper, ThingsModelEntity>
+    extends AbstractBaseService<ThingsModelMapper, TkThingsModelEntity>
     implements ThingsModelService {
   private final YtDeviceProfileService ytDeviceProfileService;
 
@@ -38,19 +39,19 @@ public class ThingsModelServiceImpl
   public YtPageData<ThingsModelDTO> page(Map<String, Object> queryMap, String tenantId) {
     String nameOrIdentifier =
         null != queryMap.get("nameOrIdentifier") ? (String) queryMap.get("nameOrIdentifier") : null;
-    IPage<ThingsModelEntity> iPage =
+    IPage<TkThingsModelEntity> iPage =
         baseMapper.selectPage(
             getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
-            new LambdaQueryWrapper<ThingsModelEntity>()
-                .eq(ThingsModelEntity::getTenantId, tenantId)
+            new LambdaQueryWrapper<TkThingsModelEntity>()
+                .eq(TkThingsModelEntity::getTenantId, tenantId)
                 .like(
                     StringUtils.isNotEmpty(nameOrIdentifier),
-                    ThingsModelEntity::getFunctionName,
+                    TkThingsModelEntity::getFunctionName,
                     nameOrIdentifier)
                 .or()
                 .like(
                     StringUtils.isNotEmpty(nameOrIdentifier),
-                    ThingsModelEntity::getIdentifier,
+                    TkThingsModelEntity::getIdentifier,
                     nameOrIdentifier));
     return getPageData(iPage, ThingsModelDTO.class);
   }
@@ -67,16 +68,16 @@ public class ThingsModelServiceImpl
         thingsModelId)) {
       throw new YtDataValidationException(ErrorMessage.DUPLICATE_IDENTIFIERS_EXIST.getMessage());
     }
-    ThingsModelEntity entity = thingsModelDTO.getEntity(ThingsModelEntity.class);
+    TkThingsModelEntity entity = thingsModelDTO.getEntity(TkThingsModelEntity.class);
     if (isAdd) {
       baseMapper.insert(entity);
       thingsModelDTO.setId(entity.getId());
     } else {
-      ThingsModelEntity result =
+      TkThingsModelEntity result =
           baseMapper.selectOne(
-              new LambdaQueryWrapper<ThingsModelEntity>()
-                  .eq(ThingsModelEntity::getTenantId, thingsModelDTO.getTenantId())
-                  .eq(ThingsModelEntity::getId, thingsModelDTO.getId()));
+              new LambdaQueryWrapper<TkThingsModelEntity>()
+                  .eq(TkThingsModelEntity::getTenantId, thingsModelDTO.getTenantId())
+                  .eq(TkThingsModelEntity::getId, thingsModelDTO.getId()));
       if (null == result) {
         throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }
@@ -87,11 +88,11 @@ public class ThingsModelServiceImpl
 
   @Override
   public ThingsModelDTO get(String id, String tenantId) {
-    ThingsModelEntity entity =
+    TkThingsModelEntity entity =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<ThingsModelEntity>()
-                .eq(ThingsModelEntity::getTenantId, tenantId)
-                .eq(ThingsModelEntity::getId, id));
+            new LambdaQueryWrapper<TkThingsModelEntity>()
+                .eq(TkThingsModelEntity::getTenantId, tenantId)
+                .eq(TkThingsModelEntity::getId, id));
     return Optional.ofNullable(entity).map(obj -> obj.getDTO(ThingsModelDTO.class)).orElse(null);
   }
 
@@ -100,9 +101,9 @@ public class ThingsModelServiceImpl
   public boolean delete(DeleteDTO dto) {
     int result =
         baseMapper.delete(
-            new LambdaQueryWrapper<ThingsModelEntity>()
-                .eq(ThingsModelEntity::getTenantId, dto.getTenantId())
-                .in(ThingsModelEntity::getId, dto.getIds()));
+            new LambdaQueryWrapper<TkThingsModelEntity>()
+                .eq(TkThingsModelEntity::getTenantId, dto.getTenantId())
+                .in(TkThingsModelEntity::getId, dto.getIds()));
     if (result > FastIotConstants.MagicNumber.ZERO && result != dto.getIds().size()) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
@@ -114,9 +115,9 @@ public class ThingsModelServiceImpl
   public boolean deleteByDeviceProfileId(String tenantId, String deviceProfileId) {
     int result =
         baseMapper.delete(
-            new LambdaQueryWrapper<ThingsModelEntity>()
-                .eq(ThingsModelEntity::getTenantId, tenantId)
-                .eq(ThingsModelEntity::getDeviceProfileId, deviceProfileId));
+            new LambdaQueryWrapper<TkThingsModelEntity>()
+                .eq(TkThingsModelEntity::getTenantId, tenantId)
+                .eq(TkThingsModelEntity::getDeviceProfileId, deviceProfileId));
     if (result == FastIotConstants.MagicNumber.ZERO) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
@@ -126,12 +127,12 @@ public class ThingsModelServiceImpl
   @Override
   public List<ThingsModelDTO> selectByDeviceProfileId(
       FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId) {
-    List<ThingsModelEntity> entityList =
+    List<TkThingsModelEntity> entityList =
         baseMapper.selectList(
-            new LambdaQueryWrapper<ThingsModelEntity>()
-                .eq(ThingsModelEntity::getTenantId, tenantId)
-                .eq(ThingsModelEntity::getDeviceProfileId, deviceProfileId)
-                .eq(ThingsModelEntity::getFunctionType, typeEnum));
+            new LambdaQueryWrapper<TkThingsModelEntity>()
+                .eq(TkThingsModelEntity::getTenantId, tenantId)
+                .eq(TkThingsModelEntity::getDeviceProfileId, deviceProfileId)
+                .eq(TkThingsModelEntity::getFunctionType, typeEnum));
     if (entityList.isEmpty()) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
@@ -141,7 +142,7 @@ public class ThingsModelServiceImpl
   }
 
   @Override
-  public JsonNode getTingsModelJson(
+  public JsonNode getTingsModelTSL(
       FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId) {
     JsonNode jsonNode = null;
     DeviceProfileDTO deviceProfileDTO =
@@ -149,41 +150,62 @@ public class ThingsModelServiceImpl
 
     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)){
+    if (typeEnum.equals(FunctionTypeEnum.properties)) {
+      DeviceTypeEnum deviceType = deviceProfileDTO.getDeviceType();
+      jsonNode = getAttributeTSL(thingsModelDTOS, deviceType);
+    } else if (typeEnum.equals(FunctionTypeEnum.services)) {
 
-      }
     }
+
     return jsonNode;
   }
 
-  /**
-   * 获取网关子设备的物模型TSL
-   *
-   * @param thingsModelDTOS
-   * @return
-   */
-  private JsonNode getSensorTSL(List<ThingsModelDTO> thingsModelDTOS) {
+  private JsonNode getAttributeTSL(
+      List<ThingsModelDTO> thingsModelDTOS, DeviceTypeEnum deviceType) {
     Map<String, List<ObjectNode>> attributeMap = new HashMap<>();
+    JsonNode jsonNode;
     List<ObjectNode> list = new ArrayList<>();
     for (ThingsModelDTO model : thingsModelDTOS) {
       ObjectNode objectNode = JacksonUtil.newObjectNode();
-      objectNode.put(model.getIdentifier(), "value");
+      DataTypeEnum type =
+          model.getFunctionJson().get("type") != null
+              ? DataTypeEnum.valueOf(model.getFunctionJson().get("type").asText())
+              : null;
+      String identifier = model.getIdentifier();
+      switch (Objects.requireNonNull(type)) {
+        case INT:
+          objectNode.put(identifier, 0);
+          break;
+        case BOOL:
+          objectNode.put(identifier, "0");
+        case DOUBLE:
+          objectNode.put(identifier, 0.00);
+        case TEXT:
+          objectNode.put(identifier, "text");
+        case STRUCT:
+          objectNode.putPOJO(identifier, model.getFunctionJson().get("specs"));
+        default:
+          objectNode.put(identifier, "value");
+      }
       list.add(objectNode);
     }
-    attributeMap.put("网关子设备名称", list);
-    return JacksonUtil.convertValue(attributeMap, JsonNode.class);
+    if (deviceType.equals(DeviceTypeEnum.SENSOR)) {
+      attributeMap.put("网关子设备名称", list);
+      jsonNode = JacksonUtil.convertValue(attributeMap, JsonNode.class);
+    } else {
+      jsonNode = JacksonUtil.convertValue(list, JsonNode.class);
+    }
+
+    return jsonNode;
   }
 
   private boolean checkIdentifier(
       String deviceProfileId, String identifier, boolean isAdd, String thingsModelId) {
-    ThingsModelEntity entity =
+    TkThingsModelEntity entity =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<ThingsModelEntity>()
-                .eq(ThingsModelEntity::getDeviceProfileId, deviceProfileId)
-                .eq(ThingsModelEntity::getIdentifier, identifier));
+            new LambdaQueryWrapper<TkThingsModelEntity>()
+                .eq(TkThingsModelEntity::getDeviceProfileId, deviceProfileId)
+                .eq(TkThingsModelEntity::getIdentifier, identifier));
     return Optional.ofNullable(entity)
         .map(
             obj -> {

@@ -15,7 +15,7 @@ import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
+import org.thingsboard.server.dao.yunteng.entities.TkAlarmContactEntity;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactMapper, AlarmContact>
+public class TkAlarmContactServiceImpl extends AbstractBaseService<AlarmContactMapper, TkAlarmContactEntity>
     implements YtAlarmContactService {
   /** mapper注入 自带方法加入,继承的baseMapper */
   private final AlarmContactMapper alarmContactMapper;
@@ -48,19 +48,19 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
   @Override
   public List<AlarmContactDTO> findAll(String tenantId, Map<String, Object> params) {
     // 查询当前租户
-    List<AlarmContact> list =
+    List<TkAlarmContactEntity> list =
         alarmContactMapper.selectList(
-            new QueryWrapper<AlarmContact>()
+            new QueryWrapper<TkAlarmContactEntity>()
                 .lambda()
-                .eq(AlarmContact::getTenantId, tenantId)
+                .eq(TkAlarmContactEntity::getTenantId, tenantId)
                 .like(
                     params.containsKey("username"),
-                    AlarmContact::getUsername,
+                    TkAlarmContactEntity::getUsername,
                     String.valueOf(params.get("username")))
                 .or()
                 .like(
                     params.containsKey("department"),
-                    AlarmContact::getOrganizationId,
+                    TkAlarmContactEntity::getOrganizationId,
                     String.valueOf(params.get("organizationId"))));
     return ReflectUtils.sourceToTarget(list, AlarmContactDTO.class);
   }
@@ -77,12 +77,12 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
     }
     List<String> organizationIds =
         organizationDTOS.stream().map(BaseDTO::getId).collect(Collectors.toList());
-    List<AlarmContact> list =
+    List<TkAlarmContactEntity> list =
         alarmContactMapper.selectList(
-            new QueryWrapper<AlarmContact>()
+            new QueryWrapper<TkAlarmContactEntity>()
                 .lambda()
-                .eq(AlarmContact::getTenantId, tenantId)
-                .in(AlarmContact::getOrganizationId, organizationIds));
+                .eq(TkAlarmContactEntity::getTenantId, tenantId)
+                .in(TkAlarmContactEntity::getOrganizationId, organizationIds));
     if (null != list && list.size() > 0) {
       return list.stream()
           .map(obj -> obj.getDTO(AlarmContactDTO.class))
@@ -97,15 +97,15 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
    * @param tenantId 租户编码
    * @return alarmContactDTO
    */
-  private LambdaQueryWrapper<AlarmContact> tenantWapper(String tenantId) {
-    return new QueryWrapper<AlarmContact>().lambda().eq(AlarmContact::getTenantId, tenantId);
+  private LambdaQueryWrapper<TkAlarmContactEntity> tenantWapper(String tenantId) {
+    return new QueryWrapper<TkAlarmContactEntity>().lambda().eq(TkAlarmContactEntity::getTenantId, tenantId);
   }
 
   @Override
   @Transactional
   public AlarmContactDTO saveAlarmContact(String tenantId, AlarmContactDTO alarmContactDTO) {
-    LambdaQueryWrapper<AlarmContact> Wrapper =
-        tenantWapper(tenantId).eq(AlarmContact::getUsername, alarmContactDTO.getUsername());
+    LambdaQueryWrapper<TkAlarmContactEntity> Wrapper =
+        tenantWapper(tenantId).eq(TkAlarmContactEntity::getUsername, alarmContactDTO.getUsername());
     int Count = baseMapper.selectCount(Wrapper);
     if (Count > 0) {
       throw new YtDataValidationException(
@@ -116,7 +116,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
       throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage());
     }
     alarmContactDTO.setTenantId(tenantId);
-    AlarmContact alarmContact = alarmContactDTO.getEntity(AlarmContact.class);
+    TkAlarmContactEntity alarmContact = alarmContactDTO.getEntity(TkAlarmContactEntity.class);
     int insertCount = baseMapper.insert(alarmContact);
     if (insertCount > 0) {
       alarmContact.copyToDTO(alarmContactDTO);
@@ -150,7 +150,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
   public boolean update(AlarmContactDTO alarmContactDTO) {
 
     // 得到对象
-    AlarmContact alarmContact = baseMapper.selectById(alarmContactDTO.getId());
+    TkAlarmContactEntity alarmContact = baseMapper.selectById(alarmContactDTO.getId());
     if (alarmContact == null) {
       throw new YtDataValidationException("此数据不存在");
     }
@@ -160,7 +160,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
         > 1) {
       throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage());
     }
-    AlarmContact entity = alarmContactDTO.getEntity(AlarmContact.class);
+    TkAlarmContactEntity entity = alarmContactDTO.getEntity(TkAlarmContactEntity.class);
     System.out.println(alarmContact);
     baseMapper.updateById(entity);
     alarmContact.copyToDTO(alarmContactDTO);
@@ -170,14 +170,14 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
   private List<String> checkPhoneEmail(String tenantId, String phone, String email) {
     return baseMapper
         .selectList(
-            new QueryWrapper<AlarmContact>()
+            new QueryWrapper<TkAlarmContactEntity>()
                 .lambda()
-                .eq(AlarmContact::getTenantId, tenantId)
+                .eq(TkAlarmContactEntity::getTenantId, tenantId)
                 .and(
                     second ->
                         second
-                            .eq(email != null, AlarmContact::getEmail, email)
-                            .or(f -> f.eq(phone != null, AlarmContact::getPhone, phone))))
+                            .eq(email != null, TkAlarmContactEntity::getEmail, email)
+                            .or(f -> f.eq(phone != null, TkAlarmContactEntity::getPhone, phone))))
         .stream()
         .map(i -> i.getId())
         .collect(Collectors.toList());
@@ -212,7 +212,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
         queryMap.put("organizationIds", queryOrganizationIds);
       }
     }
-    IPage<AlarmContact> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    IPage<TkAlarmContactEntity> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<AlarmContactDTO> pageDto = baseMapper.getAlarmPage(page, queryMap);
     return getPageData(pageDto, AlarmContactDTO.class);
   }

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
-import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
@@ -19,9 +18,9 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
-import org.thingsboard.server.dao.yunteng.mapper.YtAlarmMapper;
+import org.thingsboard.server.dao.yunteng.mapper.TkAlarmMapper;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 
 import java.util.ArrayList;
@@ -37,14 +36,14 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
+public class TkAlarmInfoServiceImpl implements YtAlarmInfoService {
 
-    private final YtAlarmMapper ytJpaAarmDao;
+    private final TkAlarmMapper ytJpaAarmDao;
     private final OrganizationMapper organizationMapper;
 
     @Override
-    public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, UUID customerId, AlarmSeverity severity, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
-        IPage<YtAlarmEntity> page = getPage(pageMap, ModelConstants.STATUS_PROPERTY+","+ModelConstants.CREATED_TIME_PROPERTY+" DESC, "+ModelConstants.STATUS_PROPERTY, OrderTypeEnum.ASC);
+    public YtPageData<TkAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, UUID customerId, AlarmSeverity severity, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
+        IPage<TkAlarmEntity> page = getPage(pageMap, ModelConstants.STATUS_PROPERTY+","+ModelConstants.CREATED_TIME_PROPERTY+" DESC, "+ModelConstants.STATUS_PROPERTY, OrderTypeEnum.ASC);
         List<String> ids = new ArrayList<>();
         if (StringUtils.isNotBlank(organizationId)) {
             List<String> filter = new ArrayList<>();
@@ -56,13 +55,13 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
 
         }
 
-        IPage<YtAlarmEntity> tbDatas = ytJpaAarmDao.alarmPage(page, tenantId.getId(), customerId, severity, alarmType, startTime, endTime, status, deviceId, deviceType, originatorType, ids.size() > 0 ? ids : null);
-        YtPageData<YtAlarmEntity> result = new YtPageData<>(tbDatas.getRecords(), tbDatas.getTotal());
+        IPage<TkAlarmEntity> tbDatas = ytJpaAarmDao.alarmPage(page, tenantId.getId(), customerId, severity, alarmType, startTime, endTime, status, deviceId, deviceType, originatorType, ids.size() > 0 ? ids : null);
+        YtPageData<TkAlarmEntity> result = new YtPageData<>(tbDatas.getRecords(), tbDatas.getTotal());
         return result;
     }
 
 
-    protected IPage<YtAlarmEntity> getPage(Map<String, Object> params, String defaultOrderField, OrderTypeEnum defaultOrder) {
+    protected IPage<TkAlarmEntity> getPage(Map<String, Object> params, String defaultOrderField, OrderTypeEnum defaultOrder) {
         int curPage = 1;
         int limit = 10;
         if (params.get(PAGE) != null) {
@@ -73,7 +72,7 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
             limit = Integer.parseInt(params.get(PAGE_SIZE).toString());
         }
 
-        Page<YtAlarmEntity> page = new Page<>(curPage, limit);
+        Page<TkAlarmEntity> page = new Page<>(curPage, limit);
         String orderField = (String) params.get(ORDER_FILED);
         OrderTypeEnum order = (OrderTypeEnum) params.get(ORDER_TYPE);
         if(StringUtils.isBlank(orderField)){

@@ -15,8 +15,8 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.AlarmProfile;
-import org.thingsboard.server.dao.yunteng.entities.SceneLinkage;
+import org.thingsboard.server.dao.yunteng.entities.TkAlarmProfileEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkSceneLinkageEntity;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmProfileMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.SceneLinkageMapper;
@@ -30,12 +30,12 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMapper, AlarmProfile>
+public class TkAlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMapper, TkAlarmProfileEntity>
         implements AlarmProfileService {
 
     private final DoActionService doActionService;
 
-    private final UserOrganizationMappingServiceImpl userOrganizationMappingService;
+    private final SysUserOrganizationMappingServiceImpl userOrganizationMappingService;
 
     private final OrganizationMapper ytOrganizationMapper;
     private final SceneLinkageMapper sceneLinkageMapper;
@@ -50,7 +50,7 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
         List<String> organizationIds = userOrganizationMappingService.getEnableOrganizationIds(isPtTenantAdmin, tenantId, currentUserId, organizationId);
 
         queryMap.put("organizationIds", organizationIds);
-        IPage<AlarmProfile> alarmProfileIPage =
+        IPage<TkAlarmProfileEntity> alarmProfileIPage =
                 getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         IPage<AlarmProfileDTO> page =
                 baseMapper.getAlarmProfilePage(alarmProfileIPage, tenantId, queryMap);
@@ -61,9 +61,9 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
     public List<AlarmProfileDTO> findAlarmProfilesByContactId(String contactId, String tenantId) {
         return ReflectUtils.sourceToTarget(
                 baseMapper.selectList(
-                        new LambdaQueryWrapper<AlarmProfile>()
-                                .eq(AlarmProfile::getTenantId, tenantId)
-                                .like(AlarmProfile::getAlarmContactId, contactId)),
+                        new LambdaQueryWrapper<TkAlarmProfileEntity>()
+                                .eq(TkAlarmProfileEntity::getTenantId, tenantId)
+                                .like(TkAlarmProfileEntity::getAlarmContactId, contactId)),
                 AlarmProfileDTO.class);
     }
 
@@ -71,7 +71,7 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
     @Transactional
     public AlarmProfileDTO saveOrUpdateAlarmProfile(AlarmProfileDTO alarmProfileDTO) {
         if (StringUtils.isNotEmpty(alarmProfileDTO.getId())) {
-            AlarmProfile alarmProfile = baseMapper.selectById(alarmProfileDTO.getId());
+            TkAlarmProfileEntity alarmProfile = baseMapper.selectById(alarmProfileDTO.getId());
             if (null == alarmProfile) {
                 throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
             }
@@ -83,9 +83,9 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
                     throw new YtDataValidationException(String.format(ErrorMessage.SCENE_REACT_USED_ALARM_PROFILE.getMessage(), names));
                 }
             }
-            baseMapper.updateById(alarmProfileDTO.getEntity(AlarmProfile.class));
+            baseMapper.updateById(alarmProfileDTO.getEntity(TkAlarmProfileEntity.class));
         } else {
-            baseMapper.insert(alarmProfileDTO.getEntity(AlarmProfile.class));
+            baseMapper.insert(alarmProfileDTO.getEntity(TkAlarmProfileEntity.class));
         }
         return alarmProfileDTO;
     }
@@ -94,7 +94,7 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
     @Transactional
     public AlarmProfileDTO updateAlarmProFileStatus(
             String alarmProfileId, String tenantId, Integer status) {
-        AlarmProfile alarmProfile = baseMapper.selectById(alarmProfileId);
+        TkAlarmProfileEntity alarmProfile = baseMapper.selectById(alarmProfileId);
         if (null == alarmProfile) {
             throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
         }
@@ -127,10 +127,10 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
             for(DoActionDTO action:list){
                 sceneIds.add(action.getSceneLinkageId());
             }
-            List<SceneLinkage> scenes = sceneLinkageMapper.selectList(new QueryWrapper<SceneLinkage>().lambda()
-                    .in(SceneLinkage::getId, sceneIds)
+            List<TkSceneLinkageEntity> scenes = sceneLinkageMapper.selectList(new QueryWrapper<TkSceneLinkageEntity>().lambda()
+                    .in(TkSceneLinkageEntity::getId, sceneIds)
             );
-            for(SceneLinkage item: scenes){
+            for(TkSceneLinkageEntity item: scenes){
                 sceneNames.add(item.getName());
             }
         }
@@ -150,9 +150,9 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
                 organizationList.stream().map(BaseDTO::getId).collect(Collectors.toSet());
         return baseMapper
                 .selectList(
-                        new LambdaQueryWrapper<AlarmProfile>()
-                                .eq(AlarmProfile::getTenantId, tenantId)
-                                .in(AlarmProfile::getOrganizationId, organizationIds))
+                        new LambdaQueryWrapper<TkAlarmProfileEntity>()
+                                .eq(TkAlarmProfileEntity::getTenantId, tenantId)
+                                .in(TkAlarmProfileEntity::getOrganizationId, organizationIds))
                 .stream()
                 .map(alarmProfile -> alarmProfile.getDTO(AlarmProfileDTO.class))
                 .collect(Collectors.toList());