fix: thingsModel service/event TSL and renamed class

黄 x
1 parent 2fbc7bd3
Showing 100 changed files with 353 additions and 350 deletions
application/src/main/java/org/thingsboard/server/controller/AlarmController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobLogController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/ThingsModelController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtAdminController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmContactController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmInfoController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmNoticeController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationCenterController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationContentController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationNodeController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtConvertDataToController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataBoardController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataComponentController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceProfileController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceScriptController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceTypeController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtFrpInfoController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtMailLogController.java
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
View file @d401024
@@ -48,7 +48,7 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -91,7 +91,7 @@ public class AlarmController extends BaseController {
     private static final String ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION = "A boolean value to specify if the alarm originator name will be " +
             "filled in the AlarmInfo object  field: 'originatorName' or will returns as null.";
-    private final YtDeviceService ytDeviceService;
+    private final TkDeviceService ytDeviceService;
     @ApiOperation(value = "Get Alarm (getAlarmById)",
             notes = "Fetch the Alarm object based on the provided Alarm Id. " + ALARM_SECURITY_CHECK, produces = MediaType.APPLICATION_JSON_VALUE)
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobController.java
View file @d401024
@@ -22,7 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.util.yunteng.CronUtils;
 import org.thingsboard.server.dao.util.yunteng.ScheduleUtils;
-import org.thingsboard.server.dao.yunteng.service.YtSysJobService;
+import org.thingsboard.server.dao.yunteng.service.TkSysJobService;
 import java.util.HashMap;
 import java.util.List;
@@ -37,7 +37,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = {"定时任务"})
 @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
 public class SysJobController extends BaseController {
-  private final YtSysJobService jobService;
+  private final TkSysJobService jobService;
   @GetMapping(
       path = "/page",
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobLogController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobLogController.java
View file @d401024
@@ -3,7 +3,6 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.quartz.SchedulerException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -14,7 +13,7 @@ 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.service.YtSysJobLogService;
+import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService;
 import java.util.HashMap;
@@ -32,7 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
 public class SysJobLogController extends BaseController {
-  private final YtSysJobLogService ytSysJobLogService;
+  private final TkSysJobLogService tkSysJobLogService;
   @GetMapping(
       path = "/page",
@@ -59,26 +58,26 @@ public class SysJobLogController extends BaseController {
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
-    return ytSysJobLogService.sysJobLogPageByJobId(queryMap);
+    return tkSysJobLogService.sysJobLogPageByJobId(queryMap);
   }
   @DeleteMapping
   @ApiOperation(value = "删除定时任务")
   public ResponseResult<Boolean> deleteSysJobLog(@RequestBody DeleteDTO deleteDTO)
       throws SchedulerException {
-    return ResponseResult.success(ytSysJobLogService.deleteSysJobLog(deleteDTO));
+    return ResponseResult.success(tkSysJobLogService.deleteSysJobLog(deleteDTO));
   }
   @GetMapping("/get/{jobId}/{id}")
   @ApiOperation(value = "获取详情")
   public ResponseResult<SysJobLogDTO> getSysJobLog(@PathVariable("jobId") String jobId,@PathVariable("id") String id)
           throws SchedulerException {
-    return ResponseResult.success(ytSysJobLogService.findSysJobLogById(jobId,id));
+    return ResponseResult.success(tkSysJobLogService.findSysJobLogById(jobId,id));
   }
   @PostMapping("/clean")
   @ApiOperation(value = "清空调度日志")
   public ResponseResult<Boolean> clean() {
-    return ResponseResult.success(ytSysJobLogService.cleanJobLog());
+    return ResponseResult.success(tkSysJobLogService.cleanJobLog());
   }
 }
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/ThingsModelController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/ThingsModelController.java
View file @d401024
@@ -23,9 +23,10 @@ import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import java.util.HashMap;
+import java.util.List;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
@@ -36,7 +37,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = {"物模型管理"})
 public class ThingsModelController extends BaseController {
   private final ThingsModelService thingsModelService;
-  private final YtDeviceProfileService ytDeviceProfileService;
+  private final TkDeviceProfileService tkDeviceProfileService;
   @GetMapping(
       path = "/page",
@@ -51,7 +52,7 @@ public class ThingsModelController extends BaseController {
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
-    if(StringUtils.isEmpty(deviceProfileId)){
+    if (StringUtils.isEmpty(deviceProfileId)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     HashMap<String, Object> queryMap = new HashMap<>();
@@ -109,11 +110,12 @@ public class ThingsModelController extends BaseController {
   }
   @PutMapping("/{deviceProfileId}")
+  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:release'})")
   @ApiOperation("物模型发布")
   public ResponseEntity<Boolean> releaseTSL(@PathVariable("deviceProfileId") String deviceProfileId)
       throws ThingsboardException {
     String tenantId = getCurrentUser().getCurrentTenantId();
-    DeviceProfileDTO dto = ytDeviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
+    DeviceProfileDTO dto = tkDeviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
     if (null == dto) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
@@ -122,11 +124,25 @@ public class ThingsModelController extends BaseController {
             deviceProfileId, tenantId, StatusEnum.ENABLE.getIndex()));
   }
+  @GetMapping("/get_services/{deviceProfileId}")
+  @ApiOperation("获取产品服务")
+  public ResponseEntity<List<ThingsModelDTO>> getServices(
+      @PathVariable("deviceProfileId") String deviceProfileId) throws ThingsboardException {
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    DeviceProfileDTO dto = tkDeviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
+    if (null == dto) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseEntity.ok(
+        thingsModelService.selectByDeviceProfileId(
+            FunctionTypeEnum.services, tenantId, deviceProfileId));
+  }
+
   private ThingsModelDTO saveOrUpdate(ThingsModelDTO thingsModelDTO) throws ThingsboardException {
     String tenantId = getCurrentUser().getCurrentTenantId();
     DeviceProfileDTO deviceProfileDTO =
-        ytDeviceProfileService.findDeviceProfileById(tenantId, thingsModelDTO.getDeviceProfileId());
+        tkDeviceProfileService.findDeviceProfileById(tenantId, thingsModelDTO.getDeviceProfileId());
     if (null == deviceProfileDTO) {
       throw new YtDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
     }
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAdminController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAdminController.java
View file @d401024
@@ -31,8 +31,8 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
-import org.thingsboard.server.dao.yunteng.service.YtTenantService;
-import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.dao.yunteng.service.TkTenantService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import org.thingsboard.server.service.install.InstallScripts;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -51,9 +51,9 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
 public class YtAdminController extends BaseController {
-  private final YtTenantService ytTenantService;
+  private final TkTenantService tkTenantService;
   private final MenuService menuService;
-  private final YtUserService userService;
+  private final TkUserService userService;
   private final TenantService tenantService;
   private final InstallScripts installScripts;
   private final UserService tbUserService;
@@ -62,7 +62,7 @@ public class YtAdminController extends BaseController {
   @Deprecated
   @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:post'})")
   public ResponseEntity<TenantDTO> saveTenant(@RequestBody TenantReqDTO tenantReqDTO) {
-    TenantDTO newTenant = ytTenantService.createNewTenant(tenantReqDTO);
+    TenantDTO newTenant = tkTenantService.createNewTenant(tenantReqDTO);
     URI location =
         ServletUriComponentsBuilder.fromCurrentRequest()
             .path("/tenant/getById/{id}")
@@ -88,7 +88,7 @@ public class YtAdminController extends BaseController {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     queryMap.put("tenantName", tenantName);
-    return ytTenantService.page(queryMap);
+    return tkTenantService.page(queryMap);
   }
   @PutMapping("/tenant")
@@ -96,13 +96,13 @@ public class YtAdminController extends BaseController {
   public TenantDTO updateTenant(@RequestBody TenantDTO tenantDTO) {
     Assert.notNull(tenantDTO, "tenant cannot be null");
     Assert.notNull(tenantDTO.getId(), "tenant id cannot be null when update");
-    return ytTenantService.updateTenant(tenantDTO);
+    return tkTenantService.updateTenant(tenantDTO);
   }
   @GetMapping("/tenant/roles/{tenantId}")
   public ResponseEntity<List<String>> getTenantRolesByTenantId(
       @PathVariable("tenantId") String tenantId) {
-    return ResponseEntity.ok(ytTenantService.getTenantRolesByTenantId(tenantId));
+    return ResponseEntity.ok(tkTenantService.getTenantRolesByTenantId(tenantId));
   }
   @DeleteMapping("/tenant")
@@ -114,7 +114,7 @@ public class YtAdminController extends BaseController {
         .getIds()
         .forEach(
             id -> {
-              ytTenantService
+              tkTenantService
                   .findById(id)
                   .ifPresent(
                       tenantDTO -> {
@@ -125,7 +125,7 @@ public class YtAdminController extends BaseController {
                         }
                       });
             });
-    ytTenantService.deleteTenants(
+    tkTenantService.deleteTenants(
         deleteDTO.getIds().toArray(new String[deleteDTO.getIds().size()]));
   }
@@ -149,7 +149,7 @@ public class YtAdminController extends BaseController {
   @GetMapping("/tenant/getById/{id}")
   public ResponseEntity<TenantDTO> getTenant(@PathVariable("id") String id) {
-    return ResponseEntity.of(ytTenantService.findById(id));
+    return ResponseEntity.of(tkTenantService.findById(id));
   }
   @PostMapping("/tenant/adminUser")
@@ -205,7 +205,7 @@ public class YtAdminController extends BaseController {
       @Validated(UpdateGroup.class) @RequestBody TenantReqDTO tenantReqDTO)
       throws ThingsboardException {
     updateOrSaveTenant(tenantReqDTO);
-    return ytTenantService.updateOrCreateTenant(tenantReqDTO);
+    return tkTenantService.updateOrCreateTenant(tenantReqDTO);
   }
   private void deleteTenantAdmin(String strUserId) throws ThingsboardException {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmContactController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmContactController.java
View file @d401024
@@ -20,7 +20,7 @@ import org.thingsboard.server.common.data.yunteng.dto.AlarmProfileDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
-import org.thingsboard.server.dao.yunteng.service.YtAlarmContactService;
+import org.thingsboard.server.dao.yunteng.service.TkAlarmContactService;
 import java.net.URI;
 import java.util.HashMap;
@@ -40,7 +40,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 @Api(tags = "告警联系人")
 public class YtAlarmContactController extends BaseController {
-  private final YtAlarmContactService alarmService;
+  private final TkAlarmContactService alarmService;
   private final AlarmProfileService alarmProfileService;
   @ApiOperation(value = "新增联系人|编辑")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmInfoController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmInfoController.java
View file @d401024
@@ -19,7 +19,7 @@ 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.TkAlarmEntity;
-import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
+import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
 import java.util.HashMap;
 import java.util.List;
@@ -39,7 +39,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = "告警中心")
 public class YtAlarmInfoController extends BaseController {
-    private final YtAlarmInfoService alarmInfoService;
+    private final TkAlarmInfoService alarmInfoService;
     //分页测试通过
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmNoticeController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmNoticeController.java
View file @d401024
@@ -8,7 +8,7 @@ import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
-import org.thingsboard.server.dao.yunteng.service.YtNoticeService;
+import org.thingsboard.server.dao.yunteng.service.TkNoticeService;
 import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
 import java.net.InetAddress;
@@ -31,7 +31,7 @@ import java.net.InetAddress;
 @Deprecated
 public class YtAlarmNoticeController {
-    private final YtNoticeService service;
+    private final TkNoticeService service;
     @PostMapping("/alert/{alarmProfileId}")
     public void alertNotice(@RequestParam(value = "token", required = true) String token,
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationCenterController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationCenterController.java
View file @d401024
@@ -18,7 +18,7 @@ import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationConte
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationCenterService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationCenterService;
 import java.util.HashMap;
@@ -31,7 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class YtConfigurationCenterController extends BaseController {
-  private final YtConfigurationCenterService ytConfigurationCenterService;
+  private final TkConfigurationCenterService ytConfigurationCenterService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationContentController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationContentController.java
View file @d401024
@@ -4,7 +4,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;
@@ -15,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentService;
 @RestController
 @RequestMapping("/api/yt/configuration/content")
@@ -23,7 +22,7 @@ import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
 @Api(tags = "组态内容")
 public class YtConfigurationContentController extends BaseController {
-  private final YtConfigurationContentService ytConfigurationContentService;
+  private final TkConfigurationContentService ytConfigurationContentService;
   @PostMapping
   @ApiOperation("新增")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationNodeController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConfigurationNodeController.java
View file @d401024
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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;
@@ -13,9 +12,9 @@ import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationActService;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationDatasourceService;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationEventService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService;
 import java.util.List;
 import java.util.Optional;
@@ -29,9 +28,9 @@ import java.util.Optional;
 @Api(tags = "组态结点管理")
 public class YtConfigurationNodeController extends BaseController {
-    private final YtConfigurationDatasourceService datasourceService;
-    private final YtConfigurationEventService eventService;
-    private final YtConfigurationActService actService;
+    private final TkConfigurationDatasourceService datasourceService;
+    private final TkConfigurationEventService eventService;
+    private final TkConfigurationActService actService;
     @PostMapping
     @ApiOperation("保存节点数据源并刷新节点的交互和动效信息")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConvertDataToController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtConvertDataToController.java
View file @d401024
@@ -33,7 +33,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
-import org.thingsboard.server.dao.yunteng.service.YtRuleChainService;
+import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
 import org.thingsboard.server.service.rule.TbRuleChainService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -48,7 +48,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = {"数据流转控制器"})
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
 public class YtConvertDataToController extends BaseController {
-    private final YtRuleChainService ytRuleChainService;
+    private final TkRuleChainService tkRuleChainService;
     @Value("${actors.rule.chain.debug_mode_rate_limits_per_tenant.enabled}")
     private boolean debugPerTenantEnabled;
@@ -225,7 +225,7 @@ public class YtConvertDataToController extends BaseController {
         boolean needSaveRuleNode;
         TenantId tenantId = getTenantId();
         // 1. GET DEFAULT RULE CHAIN
-        RuleChain ruleChain = ytRuleChainService.getRootTenantRuleChain(getTenantId());
+        RuleChain ruleChain = tkRuleChainService.getRootTenantRuleChain(getTenantId());
         // 2. GET RULE CHAIN METADATA
         RuleChainMetaData ruleChainMetaData =
                 ruleChainService.loadRuleChainMetaData(getTenantId(), ruleChain.getId());
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataBoardController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataBoardController.java
View file @d401024
@@ -21,7 +21,7 @@ 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.service.YtDataBoardService;
+import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
 import java.util.HashMap;
 import java.util.List;
@@ -35,7 +35,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 @Api(tags = {"数据看板"})
 public class YtDataBoardController extends BaseController {
-  private final YtDataBoardService ytDataBoardService;
+  private final TkDataBoardService ytDataBoardService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页查询")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataComponentController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDataComponentController.java
View file @d401024
@@ -22,8 +22,8 @@ import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO;
 import org.thingsboard.server.common.data.yunteng.dto.board.MoreDataComponentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
-import org.thingsboard.server.dao.yunteng.service.YtDataComponentService;
+import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
+import org.thingsboard.server.dao.yunteng.service.TkDataComponentService;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,8 +34,8 @@ import java.util.List;
 @RequestMapping("api/yt/data_component")
 @Api(tags = {"数据组件"})
 public class YtDataComponentController extends BaseController {
-  private final YtDataComponentService ytDataComponentService;
-  private final YtDataBoardService ytDataBoardService;
+  private final TkDataComponentService ytDataComponentService;
+  private final TkDataBoardService ytDataBoardService;
   @GetMapping("/{boardId}")
   @ApiOperation(value = "查询看板下的所有组件信息")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
View file @d401024
@@ -36,8 +36,8 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.device.DeviceService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -54,10 +54,10 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = {"设备管理"})
 @Slf4j
 public class YtDeviceController extends BaseController {
-  private final YtDeviceService deviceService;
+  private final TkDeviceService deviceService;
   private final DeviceService tbDeviceService;
   private final ObjectMapper objectMapper;
-  private final YtDeviceProfileService ytDeviceProfileService;
+  private final TkDeviceProfileService ytDeviceProfileService;
   @PostMapping
   @ApiOperation("创建|编辑")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceProfileController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceProfileController.java
View file @d401024
@@ -31,8 +31,8 @@ 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;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceScriptService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.service.security.permission.Operation;
 import java.time.LocalDateTime;
@@ -48,8 +48,8 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("api/yt/device_profile")
 @Api(tags = {"设备配置管理"})
 public class YtDeviceProfileController extends BaseController {
-  private final YtDeviceProfileService ytDeviceProfileService;
-  private final YtDeviceScriptService javaScriptService;
+  private final TkDeviceProfileService ytDeviceProfileService;
+  private final TkDeviceScriptService javaScriptService;
   @PostMapping()
   @PreAuthorize(
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceScriptController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceScriptController.java
View file @d401024
@@ -41,8 +41,8 @@ import org.thingsboard.server.common.msg.queue.ServiceQueue;
 import org.thingsboard.server.common.yunteng.script.YtScriptInvokeService;
 import org.thingsboard.server.common.yunteng.script.YtScriptType;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceScriptService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -60,8 +60,8 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 public class YtDeviceScriptController extends BaseController {
   private static final JsonParser parser = new JsonParser();
   private static final ObjectMapper objectMapper = new ObjectMapper();
-  private final YtDeviceScriptService scriptService;
-  private final YtDeviceProfileService ytDeviceProfileService;
+  private final TkDeviceScriptService scriptService;
+  private final TkDeviceProfileService ytDeviceProfileService;
   private final YtScriptInvokeService jsEngine;
   @PostMapping()
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceTypeController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceTypeController.java
View file @d401024
@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceTypeDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceTypeService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceTypeService;
 import java.util.List;
@@ -25,7 +25,7 @@ import java.util.List;
 @RequiredArgsConstructor
 @Api(value = "设备类型")
 public class YtDeviceTypeController extends BaseController {
-  private final YtDeviceTypeService deviceTypeService;
+  private final TkDeviceTypeService deviceTypeService;
   @GetMapping
   @ApiOperation(value = "获取当前用户的设备类型树形")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtFrpInfoController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtFrpInfoController.java
View file @d401024
@@ -7,7 +7,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.dto.FrpInfoDTO;
-import org.thingsboard.server.dao.yunteng.service.YtFrpInfoService;
+import org.thingsboard.server.dao.yunteng.service.TkFrpInfoService;
 @RestController
 @RequestMapping("api/yt/frp")
@@ -16,7 +16,7 @@ import org.thingsboard.server.dao.yunteng.service.YtFrpInfoService;
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class YtFrpInfoController {
-  private final YtFrpInfoService frpInfoService;
+  private final TkFrpInfoService frpInfoService;
   @GetMapping("/{proxyName}")
   @ApiOperation("通过代理名称或SN获取内网穿透信息")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtMailLogController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtMailLogController.java
View file @d401024
@@ -10,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtMailLogService;
+import org.thingsboard.server.dao.yunteng.service.TkMailLogService;
 import java.util.HashMap;
@@ -21,7 +21,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 public class YtMailLogController extends BaseController {
-    private final YtMailLogService mailLogService;
+    private final TkMailLogService mailLogService;
     @GetMapping(params = {PAGE_SIZE, PAGE})
     public YtPageData<MailLogDTO> pageMessageConfig(
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtMessageConfigController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtMessageConfigController.java
View file @d401024
@@ -16,7 +16,7 @@ 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.service.YtMessageConfigService;
+import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
 import java.util.HashMap;
 import java.util.List;
@@ -28,7 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 public class YtMessageConfigController extends BaseController {
-  private final YtMessageConfigService messageConfigService;
+  private final TkMessageConfigService messageConfigService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
   public YtPageData<MessageConfigDTO> pageMessageConfig(
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtMessageTemplateController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtMessageTemplateController.java
View file @d401024
@@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.yunteng.enums.ResponseCodeEnum;
 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.service.YtMailService;
-import org.thingsboard.server.dao.yunteng.service.YtMessageTemplateService;
-import org.thingsboard.server.dao.yunteng.service.YtSmsService;
+import org.thingsboard.server.dao.yunteng.service.TkMailService;
+import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
+import org.thingsboard.server.dao.yunteng.service.TkSmsService;
 import java.util.HashMap;
@@ -35,11 +35,11 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 public class YtMessageTemplateController extends BaseController {
-  private final YtMessageTemplateService messageTemplateService;
+  private final TkMessageTemplateService messageTemplateService;
-  private final YtSmsService smsService;
+  private final TkSmsService smsService;
-  private final YtMailService mailService;
+  private final TkMailService mailService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
   public YtPageData<MessageTemplateDTO> pageMessageTemplate(
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtNoAuthController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtNoAuthController.java
View file @d401024
@@ -33,11 +33,11 @@ import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstan
 @RequiredArgsConstructor
 public class YtNoAuthController{
-  private final YtSmsService smsService;
-  private final YtUserService userService;
-  private final YtFrpInfoService frpInfoService;
-  private final YtDataComponentService ytDataComponentService;
-  private final YtDataBoardService ytDataBoardService;
+  private final TkSmsService smsService;
+  private final TkUserService userService;
+  private final TkFrpInfoService frpInfoService;
+  private final TkDataComponentService ytDataComponentService;
+  private final TkDataBoardService ytDataBoardService;
   @PostMapping("/send_login_code/{phoneNumber}")
   public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtOpinionController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtOpinionController.java
View file @d401024
@@ -15,7 +15,7 @@ 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.TkOpinionEntity;
-import org.thingsboard.server.dao.yunteng.service.YtOpinionService;
+import org.thingsboard.server.dao.yunteng.service.TkOpinionService;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -25,7 +25,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 public class YtOpinionController extends BaseController {
-    private final YtOpinionService opinionService;
+    private final TkOpinionService opinionService;
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtOrganizationController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtOrganizationController.java
View file @d401024
@@ -15,7 +15,7 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtOrganizationService;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import java.net.URI;
 import java.util.List;
@@ -27,7 +27,7 @@ import java.util.Optional;
 @RequiredArgsConstructor
 public class YtOrganizationController extends BaseController {
-  private final YtOrganizationService organizationService;
+  private final TkOrganizationService organizationService;
   @PostMapping
   @PreAuthorize("@check.checkPermissions({},{'api:yt:organization:post'})")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportFormConfigController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportFormConfigController.java
View file @d401024
@@ -21,7 +21,7 @@ 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.service.YtReportFormConfigService;
+import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -36,7 +36,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class YtReportFormConfigController extends BaseController {
-  private final YtReportFormConfigService reportFormConfigService;
+  private final TkReportFormConfigService reportFormConfigService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportGenerateRecordController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportGenerateRecordController.java
View file @d401024
@@ -22,8 +22,8 @@ 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.service.YtReportFormConfigService;
-import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
+import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
+import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -40,8 +40,8 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class YtReportGenerateRecordController extends BaseController {
-  private final YtReportGenerateRecordService reportFormGenerateRecordService;
-  private final YtReportFormConfigService ytReportFormConfigService;
+  private final TkReportGenerateRecordService reportFormGenerateRecordService;
+  private final TkReportFormConfigService tkReportFormConfigService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页")
@@ -104,7 +104,7 @@ public class YtReportGenerateRecordController extends BaseController {
           JacksonUtil.convertValue(
               json.get(FastIotConstants.CHART_EXECUTE_CONDITION), QueryConditionDTO.class);
       List<ExecuteAttributesDTO> list = new ArrayList<>();
-      ytReportFormConfigService.getExecuteConditionAndAttribute(
+      tkReportFormConfigService.getExecuteConditionAndAttribute(
           json.get(FastIotConstants.CHART_EXECUTE_ATTRIBUTES), list);
       map.put(FastIotConstants.CHART_EXECUTE_CONDITION, queryConditionDTO);
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtRpcRecordController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtRpcRecordController.java
View file @d401024
@@ -15,7 +15,7 @@ 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.TkRpcRecordEntity;
-import org.thingsboard.server.dao.yunteng.service.YtRpcRecordService;
+import org.thingsboard.server.dao.yunteng.service.TkRpcRecordService;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -27,7 +27,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = {"命令下发记录"})
 @RequiredArgsConstructor
 public class YtRpcRecordController extends BaseController {
-    private final YtRpcRecordService recordService;
+    private final TkRpcRecordService recordService;
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtRuleChainController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtRuleChainController.java
View file @d401024
@@ -11,14 +11,14 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtRuleChainService;
+import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("api/yt/rule_chain")
 @Api(tags = {"规则链管理"})
 public class YtRuleChainController extends BaseController {
-    private final YtRuleChainService chainService;
+    private final TkRuleChainService chainService;
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtSyslogController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtSyslogController.java
View file @d401024
@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
-import org.thingsboard.server.dao.yunteng.service.YtSysLogService;
+import org.thingsboard.server.dao.yunteng.service.TkSysLogService;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -26,7 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 public class YtSyslogController extends BaseController {
-    private final YtSysLogService logService;
+    private final TkSysLogService logService;
     @GetMapping("{entityId}")
     @PreAuthorize("@check.checkPermissions({},{})")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtTenantController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtTenantController.java
View file @d401024
@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.dao.user.UserService;
-import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
@@ -24,12 +24,12 @@ import java.util.UUID;
 @RequestMapping("/api/yt/tenant")
 public class YtTenantController extends AbstractUserAccount {
-  private final YtUserService userService;
+  private final TkUserService userService;
   private final AccountProperties accountProperties;
   public YtTenantController(UserService tbUserService, ApplicationEventPublisher eventPublisher,
                           SystemSecurityService systemSecurityService,
                           BCryptPasswordEncoder passwordEncoder,
-                          YtUserService userService,
+                          TkUserService userService,
                           AccountProperties accountProperties) {
     super(tbUserService,eventPublisher,systemSecurityService,passwordEncoder);
     this.userService = userService;
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtThirdPlatformController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtThirdPlatformController.java
View file @d401024
@@ -24,8 +24,8 @@ 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.TkThirdUserEntity;
-import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
-import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.dao.yunteng.service.TkThirdPlatformService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRepository;
 import org.thingsboard.server.service.security.auth.yunteng.YtLoginResponse;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -48,8 +48,8 @@ public class YtThirdPlatformController extends BaseController {
     private final JwtTokenFactory tokenFactory;
     private final RefreshTokenRepository refreshTokenRepository;
-    private final YtThirdPlatformService thirdService;
-    private final YtUserService ytUserService;
+    private final TkThirdPlatformService thirdService;
+    private final TkUserService tkUserService;
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
@@ -105,7 +105,7 @@ public class YtThirdPlatformController extends BaseController {
     @ApiOperation("组态用户认证")
     public YtLoginResponse unionidLogin(@PathVariable("userId") String userId)
             throws ThingsboardException {
-        UserDTO userDto = ytUserService.findUserInfoById(userId);
+        UserDTO userDto = tkUserService.findUserInfoById(userId);
         if (userDto == null) {
             return new YtLoginResponse().setThirdUserId(userId);
         }
@@ -121,7 +121,7 @@ public class YtThirdPlatformController extends BaseController {
         if(!authrizeKey.equals(dto.getAuthrizeKey()) || !authrizeSecret.equals(dto.getAuthrizeSecret())){
             throw new DataValidationException( ErrorMessage.NO_PERMISSION.getMessage());
         }
-        UserDTO userDto = ytUserService.accountExist(dto.getUserName());
+        UserDTO userDto = tkUserService.accountExist(dto.getUserName());
         if (userDto == null) {
             return new YtLoginResponse().setThirdUserId(dto.getAuthrizeKey());
         }
@@ -135,7 +135,7 @@ public class YtThirdPlatformController extends BaseController {
         if (userDto != null && StringUtils.isNotEmpty(userDto.getTbUser())) {
             UserId userId = new UserId(UUID.fromString(userDto.getTbUser()));
             User user = userService.findUserById(null, userId);
-            List<UserDetailsDTO> userDetailsDTOS =  ytUserService.findUserDetailsByUsername(userDto.getUsername(),userDto.getTenantId());
+            List<UserDetailsDTO> userDetailsDTOS =  tkUserService.findUserDetailsByUsername(userDto.getUsername(),userDto.getTenantId());
             user.setUserDetailsDTO(userDetailsDTOS.get(0));
             UserCredentials credentials = userService.findUserCredentialsByUserId(user.getTenantId(), userId);
             String email = user.getEmail();
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtUserController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtUserController.java
View file @d401024
@@ -40,7 +40,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.entities.SysUserEntity;
-import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -59,12 +59,12 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(value = "用户接口")
 public class YtUserController extends AbstractUserAccount {
-  private final YtUserService userService;
+  private final TkUserService userService;
   private final AccountProperties accountProperties;
   public YtUserController(UserService tbUserService, ApplicationEventPublisher eventPublisher,
                           SystemSecurityService systemSecurityService,
                           BCryptPasswordEncoder passwordEncoder,
-                          YtUserService userService,
+                          TkUserService userService,
                           AccountProperties accountProperties) {
     super(tbUserService,eventPublisher,systemSecurityService,passwordEncoder);
     this.userService = userService;
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtVideoController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtVideoController.java
View file @d401024
@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
-import org.thingsboard.server.dao.yunteng.service.YtVideoService;
+import org.thingsboard.server.dao.yunteng.service.TkVideoService;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,7 +30,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class YtVideoController extends BaseController {
-    private final YtVideoService videoService;
+    private final TkVideoService videoService;
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtVideoPlatformController.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtVideoPlatformController.java
View file @d401024
@@ -15,7 +15,7 @@ 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.TkVideoPlatformEntity;
-import org.thingsboard.server.dao.yunteng.service.YtVideoPlatformService;
+import org.thingsboard.server.dao.yunteng.service.TkVideoPlatformService;
 import java.util.List;
@@ -28,7 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class YtVideoPlatformController extends BaseController {
-  private final YtVideoPlatformService videoPlatformService;
+  private final TkVideoPlatformService videoPlatformService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页")
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java
View file @d401024
@@ -16,7 +16,6 @@
 package org.thingsboard.server.service.security.auth.jwt;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.CredentialsExpiredException;
@@ -34,11 +33,10 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.Authority;
-import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.utils.AccountProperties;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
-import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import org.thingsboard.server.service.security.auth.RefreshAuthenticationToken;
 import org.thingsboard.server.service.security.auth.TokenOutdatingService;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -59,7 +57,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
     private final UserService userService;
     private final CustomerService customerService;
     private final TokenOutdatingService tokenOutdatingService;
-    private final YtUserService ytUserService;
+    private final TkUserService tkUserService;
     private final AccountProperties accountProperties;
     @Override
@@ -107,7 +105,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
             UserPrincipal userPrincipal = new UserPrincipal(UserPrincipal.Type.USER_NAME, user.getEmail());
             String userName = user.getEmail().indexOf("@") != -1 ?user.getEmail().split("@")[0]:user.getEmail();
-            List<UserDetailsDTO> userDetailsDTOS =  ytUserService.findUserDetailsByUsername(userName,
+            List<UserDetailsDTO> userDetailsDTOS =  tkUserService.findUserDetailsByUsername(userName,
                     user.getTenantId().getId().toString());
             user.setUserDetailsDTO(null != userDetailsDTOS && userDetailsDTOS.size()>0 ? userDetailsDTOS.get(0):null);
             securityUser = new SecurityUser(user, userCredentials.isEnabled(), userPrincipal);
@@ -116,7 +114,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
     }
     private SecurityUser authenticateByPlatFormUserId(UserId userId){
-        UserDTO userDTO =ytUserService.findUserInfoById(userId.getId().toString());
+        UserDTO userDTO = tkUserService.findUserInfoById(userId.getId().toString());
         if(null != userDTO){
             String email = userDTO.getUsername() + "@" +accountProperties.getEmailSuffix();
             UserPrincipal userPrincipal = new UserPrincipal(UserPrincipal.Type.USER_NAME, email);
@@ -125,7 +123,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
             user.setTenantId(TenantId.fromUUID(EntityId.NULL_UUID));
             user.setId(userId);
             user.setEmail(email);
-            List<UserDetailsDTO> userDetailsDTOS =  ytUserService.findUserDetailsByUsername(userDTO.getUsername(),
+            List<UserDetailsDTO> userDetailsDTOS =  tkUserService.findUserDetailsByUsername(userDTO.getUsername(),
                     user.getTenantId().getId().toString());
             user.setUserDetailsDTO(null != userDetailsDTOS && userDetailsDTOS.size()>0 ? userDetailsDTOS.get(0):null);
             SecurityUser securityUser = new SecurityUser(user, true, userPrincipal);
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java
View file @d401024
@@ -49,7 +49,7 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 import org.thingsboard.server.dao.user.UserService;
-import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import ua_parser.Client;
 import java.time.LocalDateTime;
@@ -279,12 +279,12 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
         device);
   }
-  @Autowired private YtUserService ytUserService;
+  @Autowired private TkUserService tkUserService;
   @Autowired private CacheUtils cacheUtils;
   @Autowired private PasswordEncoder passwordEncoder;
   private Optional<UserDetailsDTO> ytUserDetailsByUserName(String username, String password) {
-    List<UserDetailsDTO> users = ytUserService.findUserDetailsByUsername(username,null);
+    List<UserDetailsDTO> users = tkUserService.findUserDetailsByUsername(username,null);
     if (users.isEmpty()) {
       throw new UsernameNotFoundException("User not found: " + username);
@@ -304,7 +304,7 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
   private Authentication ytUserDetailsByPhone(
       Authentication authentication, UserPrincipal userPrincipal, String phoneNumber, String code) {
-    List<UserDetailsDTO> users = ytUserService.getUserByPhoneNumber(phoneNumber);
+    List<UserDetailsDTO> users = tkUserService.getUserByPhoneNumber(phoneNumber);
     if (users.isEmpty()) {
       throw new UsernameNotFoundException("phone number not found: " + phoneNumber);
     }
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @d401024
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @d401024
@@ -75,7 +75,7 @@ import org.thingsboard.server.dao.device.provision.ProvisionResponse;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.GetDeviceCredentialsRequestMsg;
@@ -127,7 +127,7 @@ public class DefaultTransportApiService implements TransportApiService {
     private final TbTenantProfileCache tenantProfileCache;
     private final TbApiUsageStateService apiUsageStateService;
     private final DeviceService deviceService;
-    private final YtDeviceService ytDeviceService;
+    private final TkDeviceService ytDeviceService;
     private final RelationService relationService;
     private final DeviceCredentialsService deviceCredentialsService;
     private final DbCallbackExecutorService dbCallbackExecutorService;
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/BaseModelDTO.java
View file @d401024
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/BaseModelDTO.java
View file @d401024
@@ -10,7 +10,4 @@ public class BaseModelDTO {
   @ApiModelProperty("标识符")
   private String identifier;
-
-  @ApiModelProperty("备注")
-  private String remark;
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/EventModelDTO.java
View file @d401024
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/EventModelDTO.java
View file @d401024
@@ -5,13 +5,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("事件模型")
 public class EventModelDTO extends BaseModelDTO {
-  @ApiModelProperty("时间类型：0 信息 1告警 2故障")
-  private Integer type;
+  @ApiModelProperty("时间类型：INFO信息 ALERT告警 ERROR故障")
+  private DeviceEventTypeEnum eventType;
   @ApiModelProperty("输出参数")
   private JsonNode outputData;
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/ServiceModelDTO.java
View file @d401024
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/ServiceModelDTO.java
View file @d401024
@@ -5,13 +5,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("服务模型")
 public class ServiceModelDTO extends BaseModelDTO {
-  @ApiModelProperty("调用方式：0 同步 1异步")
-  private Integer method;
+  @ApiModelProperty("调用方式：sync同步 async异步")
+  private CallTypeEnum callType;
   @ApiModelProperty("输入参数")
   private JsonNode inputData;
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/DateTimeUtils.java 0 → 100644
View file @d401024
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/DateTimeUtils.java 0 → 100644
View file @d401024
+package org.thingsboard.server.common.data.yunteng.utils;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @version V1.0 @Description : 1.其它地方抛出异常，交由控制层统一处理 2.服务层注意持久化的事务管理 @Dependency: 依赖包 @Author:
+ *     junlianglee @Date Created in 2021/12/28$ @Copyright 2016-2018 - Powered By 李唐源研发中心
+ */
+public class DateTimeUtils {
+  public static final String PATTERN_DATE_FORMATE = "yyyy-MM-dd HH:mm:ss";
+
+  public static String format(Long nacosTime) {
+    if (nacosTime == null) {
+      return null;
+    }
+    LocalDateTime createTime =
+        LocalDateTime.ofEpochSecond(nacosTime / 1000, 0, OffsetDateTime.now().getOffset());
+    return createTime.format(DateTimeFormatter.ofPattern(PATTERN_DATE_FORMATE));
+  }
+}
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/RequestUtils.java deleted 100644 → 0
View file @2fbc7bd
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/RequestUtils.java deleted 100644 → 0
View file @2fbc7bd
-package org.thingsboard.server.common.data.yunteng.utils;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class RequestUtils {
-  public static String getClientIpAddr(HttpServletRequest request) {
-    String ip = request.getHeader("X-Forwarded-For");
-    if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-      ip = request.getHeader("Proxy-Client-IP");
-    }
-    if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-      ip = request.getHeader("WL-Proxy-Client-IP");
-    }
-    if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-      ip = request.getHeader("HTTP_CLIENT_IP");
-    }
-    if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-      ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-    }
-    if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-      ip = request.getRemoteAddr();
-    }
-    return ip;
-  }
-}
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/YtDateTimeUtils.java deleted 100644 → 0
View file @2fbc7bd
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/YtDateTimeUtils.java deleted 100644 → 0
View file @2fbc7bd
-package org.thingsboard.server.common.data.yunteng.utils;
-
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * @version V1.0
- * @Description :
- * 1.其它地方抛出异常，交由控制层统一处理
- * 2.服务层注意持久化的事务管理
- * @Dependency: 依赖包
- * @Author: junlianglee
- * @Date Created in 2021/12/28$
- * @Copyright 2016-2018  - Powered By 李唐源研发中心
- */
-public class YtDateTimeUtils {
-    public static final String PATTERN_DATE_FORMATE="yyyy-MM-dd HH:mm:ss";
-
-    public static String formate(Long nacosTime) {
-        if(nacosTime == null){
-            return null;
-        }
-        LocalDateTime createTime = LocalDateTime.ofEpochSecond(nacosTime/1000,0, OffsetDateTime.now().getOffset());
-        return createTime.format(DateTimeFormatter.ofPattern(PATTERN_DATE_FORMATE));
-    }
-
-}
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View file @d401024
@@ -45,7 +45,7 @@ import org.thingsboard.server.dao.service.Validator;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import static org.thingsboard.server.dao.service.Validator.validateId;
@@ -104,7 +104,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
     @Autowired
     private DataValidator<Tenant> tenantValidator;
     @Autowired
-    private YtDeviceProfileService ytDeviceProfileService;
+    private TkDeviceProfileService ytDeviceProfileService;
     @Override
     public Tenant findTenantById(TenantId tenantId) {
         log.trace("Executing findTenantById [{}]", tenantId);
--- a/dao/src/main/java/org/thingsboard/server/dao/util/yunteng/AbstractQuartzJob.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/yunteng/AbstractQuartzJob.java
View file @d401024
@@ -13,7 +13,7 @@ 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.SysJobEntity;
 import org.thingsboard.server.dao.yunteng.entities.SysJobLogEntity;
-import org.thingsboard.server.dao.yunteng.service.YtSysJobLogService;
+import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -74,7 +74,7 @@ public abstract class AbstractQuartzJob implements Job {
     }
     // 写入数据库当中
-    SpringBeanUtils.getBean(YtSysJobLogService.class)
+    SpringBeanUtils.getBean(TkSysJobLogService.class)
         .saveOrUpdateSysJobLog(sysJobLog.getDTO(SysJobLogDTO.class));
   }
--- a/dao/src/main/java/org/thingsboard/server/dao/util/yunteng/JobInvokeUtil.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/yunteng/JobInvokeUtil.java
View file @d401024
@@ -6,8 +6,8 @@ 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.SysJobEntity;
-import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
-import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
+import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
+import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -30,10 +30,10 @@ public class JobInvokeUtil {
         && sysJob.getJobGroup().equals(JobGroupEnum.REPORT.toString())) {
       // 写入报表生成记录
       ReportFormConfigDTO formConfigDTO =
-          SpringBeanUtils.getBean(YtReportFormConfigService.class)
+          SpringBeanUtils.getBean(TkReportFormConfigService.class)
               .findReportFormConfigById(sysJob.getSourceId(), sysJob.getTenantId());
       ReportGenerateRecordDTO dto =
-          SpringBeanUtils.getBean(YtReportGenerateRecordService.class)
+          SpringBeanUtils.getBean(TkReportGenerateRecordService.class)
               .generateReportRecord(formConfigDTO, sysJob.getId());
       reportGenerateRecordId = dto.getId();
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/util/yunteng/task/ReportTask.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/yunteng/task/ReportTask.java
View file @d401024
@@ -6,17 +6,17 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
-import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
-import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
+import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
+import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
 import java.util.*;
 @Component("reportTask")
 @RequiredArgsConstructor
 @Slf4j
 public class ReportTask {
-  private final YtReportFormConfigService ytReportFormConfigService;
+  private final TkReportFormConfigService tkReportFormConfigService;
-  private final YtReportGenerateRecordService ytReportGenerateRecordService;
+  private final TkReportGenerateRecordService tkReportGenerateRecordService;
   public void multipleParams(String s, Boolean b, Long l, Double d, Integer i) {
     System.out.println("执行多参方法： s=" + s + "b=" + b + "l=" + l + "d" + d + "i=" + i);
@@ -33,7 +33,7 @@ public class ReportTask {
   public void generateReport(String reportId, String reportGenerateRecordId) {
     ReportFormConfigDTO formConfigDTO =
-        ytReportFormConfigService.findReportFormConfigById(reportId);
+        tkReportFormConfigService.findReportFormConfigById(reportId);
     // 关联设备
     List<ExecuteAttributesDTO> dtoList = formConfigDTO.getExecuteAttributes();
     if (!dtoList.isEmpty()) {
@@ -61,7 +61,7 @@ public class ReportTask {
       ExecuteAttributesDTO dto,
       String reportGenerateRecordId,
       int surplus) {
-    ytReportGenerateRecordService.generateExcelUpdateReportRecord(
+    tkReportGenerateRecordService.generateExcelUpdateReportRecord(
         formConfigDTO, dto, reportGenerateRecordId, surplus);
   }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/entities/TkAlarmEntity.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/entities/TkAlarmEntity.java
View file @d401024
@@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
-import org.thingsboard.server.common.data.yunteng.utils.YtDateTimeUtils;
+import org.thingsboard.server.common.data.yunteng.utils.DateTimeUtils;
-import javax.validation.constraints.NotEmpty;
 import java.util.UUID;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COLUMN_FAMILY_NAME;
@@ -84,26 +82,26 @@ public class TkAlarmEntity {
   private String organizationName;
   public String getStartTs() {
-    return YtDateTimeUtils.formate(this.startTs);
+    return DateTimeUtils.format(this.startTs);
   }
   public String getEndTs() {
-    return YtDateTimeUtils.formate(this.endTs);
+    return DateTimeUtils.format(this.endTs);
   }
   public String getAckTs() {
-    return YtDateTimeUtils.formate(this.ackTs);
+    return DateTimeUtils.format(this.ackTs);
   }
   public String getClearTs() {
-    return YtDateTimeUtils.formate(this.clearTs);
+    return DateTimeUtils.format(this.clearTs);
   }
   public String getCreatedTime() {
-    return YtDateTimeUtils.formate(this.createdTime);
+    return DateTimeUtils.format(this.createdTime);
   }
   public String getUpdatedTime() {
-    return YtDateTimeUtils.formate(this.updatedTime);
+    return DateTimeUtils.format(this.updatedTime);
   }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysJobLogServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysJobLogServiceImpl.java
View file @d401024
@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 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;
+import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService;
 import java.util.Map;
 import java.util.Optional;
@@ -25,7 +25,7 @@ import java.util.Optional;
 @RequiredArgsConstructor
 @Slf4j
 public class SysJobLogServiceImpl extends AbstractBaseService<SysJobLogMapper, SysJobLogEntity>
-    implements YtSysJobLogService {
+    implements TkSysJobLogService {
   @Override
   public YtPageData<SysJobLogDTO> sysJobLogPageByJobId(Map<String, Object> queryMap) {
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysJobServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysJobServiceImpl.java
View file @d401024
@@ -26,7 +26,7 @@ import java.util.*;
 @Service
 @RequiredArgsConstructor
 public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobEntity>
-    implements YtSysJobService {
+    implements TkSysJobService {
   private final Scheduler scheduler;
   /** 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据） */
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysLogServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysLogServiceImpl.java
View file @d401024
@@ -11,7 +11,7 @@ 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.SysLogMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtSysLogService;
+import org.thingsboard.server.dao.yunteng.service.TkSysLogService;
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor
 public class SysLogServiceImpl extends AbstractBaseService<SysLogMapper, SysLogEntity>
-        implements YtSysLogService {
+        implements TkSysLogService {
     @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserServiceImpl.java
View file @d401024
@@ -58,7 +58,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.ModelConstants
 @Slf4j
 @RequiredArgsConstructor
 public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserEntity>
-    implements YtUserService {
+    implements TkUserService {
   private final AdminSettingMapper adminSettingMapper;
   private final ObjectMapper mapper;
@@ -67,9 +67,9 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
   private final UserRoleMapper userRoleMapper;
   private final TenantRoleMapper tenantRoleMapper;
-  private final YtSmsService ytSmsService;
-  private final YtMessageTemplateService messageTemplateService;
-  private final YtOrganizationService organizationService;
+  private final TkSmsService tkSmsService;
+  private final TkMessageTemplateService messageTemplateService;
+  private final TkOrganizationService organizationService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final SceneLinkageService sceneLinkageService;
   private final SceneLinkageMapper sceneLinkageMapper;
@@ -544,7 +544,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
       params.put("code", accountProperties.getDefaultPassword());
       smsReqDTO.setParams(params);
       smsReqDTO.setTemplatePurpose(messageTemplateDTO.getTemplatePurpose());
-      ytSmsService.sendSms(smsReqDTO);
+      tkSmsService.sendSms(smsReqDTO);
     }
   }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/ThingsModelServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/ThingsModelServiceImpl.java
View file @d401024
@@ -6,14 +6,13 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
-import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 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;
@@ -24,7 +23,7 @@ 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;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -34,7 +33,7 @@ import java.util.stream.Collectors;
 public class ThingsModelServiceImpl
     extends AbstractBaseService<ThingsModelMapper, TkThingsModelEntity>
     implements ThingsModelService {
-  private final YtDeviceProfileService ytDeviceProfileService;
+  private final TkDeviceProfileService ytDeviceProfileService;
   @Override
   public YtPageData<ThingsModelDTO> page(
@@ -152,17 +151,44 @@ public class ThingsModelServiceImpl
   @Override
   public JsonNode getTingsModelTSL(
       FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId) {
-    JsonNode jsonNode = null;
+    JsonNode jsonNode;
     DeviceProfileDTO deviceProfileDTO =
         ytDeviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
-
+    if (null == deviceProfileDTO) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
     List<ThingsModelDTO> thingsModelDTOS =
         selectByDeviceProfileId(typeEnum, tenantId, deviceProfileId);
+
+    DeviceTypeEnum deviceType = deviceProfileDTO.getDeviceType();
     if (typeEnum.equals(FunctionTypeEnum.properties)) {
-      DeviceTypeEnum deviceType = deviceProfileDTO.getDeviceType();
       jsonNode = getAttributeTSL(thingsModelDTOS, deviceType);
-    } else if (typeEnum.equals(FunctionTypeEnum.services)) {
-      // TODO 服务
+    } else {
+      if (typeEnum.equals(FunctionTypeEnum.services)) {
+        List<ServiceModelDTO> serviceList = new ArrayList<>();
+        for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
+          ServiceModelDTO serviceDTO = new ServiceModelDTO();
+          BeanUtils.copyProperties(thingsModelDTO, serviceDTO);
+          JsonNode functionJson = thingsModelDTO.getFunctionJson();
+          if (null != functionJson) {
+            serviceDTO.setInputData(functionJson.get("inputData"));
+            serviceDTO.setOutputData(functionJson.get("outputData"));
+          }
+          serviceList.add(serviceDTO);
+        }
+        jsonNode = JacksonUtil.convertValue(serviceList, JsonNode.class);
+      } else {
+        List<EventModelDTO> eventList = new ArrayList<>();
+        for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
+          EventModelDTO eventDTO = new EventModelDTO();
+          BeanUtils.copyProperties(thingsModelDTO, eventDTO);
+          JsonNode functionJson = thingsModelDTO.getFunctionJson();
+          if (null != functionJson) {
+            eventDTO.setOutputData(functionJson.get("outputData"));
+          }
+        }
+        jsonNode = JacksonUtil.convertValue(eventList, JsonNode.class);
+      }
     }
     return jsonNode;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkAlarmContactServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkAlarmContactServiceImpl.java
View file @d401024
@@ -20,7 +20,7 @@ import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
-import org.thingsboard.server.dao.yunteng.service.YtAlarmContactService;
+import org.thingsboard.server.dao.yunteng.service.TkAlarmContactService;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class TkAlarmContactServiceImpl extends AbstractBaseService<AlarmContactMapper, TkAlarmContactEntity>
-    implements YtAlarmContactService {
+    implements TkAlarmContactService {
   /** mapper注入 自带方法加入,继承的baseMapper */
   private final AlarmContactMapper alarmContactMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkAlarmInfoServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkAlarmInfoServiceImpl.java
View file @d401024
@@ -21,7 +21,7 @@ import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkAlarmMapper;
-import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
+import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +36,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class TkAlarmInfoServiceImpl implements YtAlarmInfoService {
+public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
     private final TkAlarmMapper ytJpaAarmDao;
     private final OrganizationMapper organizationMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkAlarmServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkAlarmServiceImpl.java
View file @d401024
@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmContactEntity;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtAlarmService;
+import org.thingsboard.server.dao.yunteng.service.TkAlarmService;
 import java.util.List;
 import java.util.Map;
@@ -30,7 +30,7 @@ import java.util.Set;
  */
 @Service
 @RequiredArgsConstructor
-public class TkAlarmServiceImpl extends AbstractBaseService<AlarmContactMapper, TkAlarmContactEntity> implements YtAlarmService {
+public class TkAlarmServiceImpl extends AbstractBaseService<AlarmContactMapper, TkAlarmContactEntity> implements TkAlarmService {
     /**
      * mapper注入 自带方法加入,继承的baseMapper
      */
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationActServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationActServiceImpl.java
View file @d401024
@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ConfigurationActDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkConfigurationActEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationActMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationActService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkConfigurationActServiceImpl
         extends AbstractBaseService<ConfigurationActMapper, TkConfigurationActEntity>
-        implements YtConfigurationActService {
+        implements TkConfigurationActService {
     @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationCenterServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationCenterServiceImpl.java
View file @d401024
@@ -17,8 +17,8 @@ import org.thingsboard.server.dao.yunteng.mapper.ConfigurationCenterMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationCenterService;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationCenterService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentService;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -29,9 +29,9 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkConfigurationCenterServiceImpl
     extends AbstractBaseService<ConfigurationCenterMapper, TkConfigurationCenterEntity>
-    implements YtConfigurationCenterService {
+    implements TkConfigurationCenterService {
   private final OrganizationMapper organizationMapper;
-  private final YtConfigurationContentService ytConfigurationContentService;
+  private final TkConfigurationContentService ytConfigurationContentService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationContentServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationContentServiceImpl.java
View file @d401024
@@ -19,7 +19,7 @@ import org.thingsboard.server.dao.yunteng.mapper.ConfigurationContentMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationDatasourceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationEventMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentService;
 import java.util.List;
 import java.util.Set;
@@ -28,7 +28,7 @@ import java.util.Set;
 @RequiredArgsConstructor
 public class TkConfigurationContentServiceImpl
     extends AbstractBaseService<ConfigurationContentMapper, TkConfigurationContentEntity>
-    implements YtConfigurationContentService {
+    implements TkConfigurationContentService {
   private final ConfigurationDatasourceMapper datasourceMapper;
   private final ConfigurationEventMapper eventMapper;
   private final ConfigurationActMapper actMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationDatasourceServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationDatasourceServiceImpl.java
View file @d401024
@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ConfigurationDatasourceDTO
 import org.thingsboard.server.dao.yunteng.entities.TkConfigurationDatasourceEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationDatasourceMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationDatasourceService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkConfigurationDatasourceServiceImpl
         extends AbstractBaseService<ConfigurationDatasourceMapper, TkConfigurationDatasourceEntity>
-        implements YtConfigurationDatasourceService {
+        implements TkConfigurationDatasourceService {
     @Override
     @Transactional(rollbackFor = Exception.class)
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationEventServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConfigurationEventServiceImpl.java
View file @d401024
@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ConfigurationEventDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkConfigurationEventEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationEventMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtConfigurationEventService;
+import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkConfigurationEventServiceImpl
         extends AbstractBaseService<ConfigurationEventMapper, TkConfigurationEventEntity>
-        implements YtConfigurationEventService {
+        implements TkConfigurationEventService {
     @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDataBoardServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDataBoardServiceImpl.java
View file @d401024
@@ -21,7 +21,7 @@ import org.thingsboard.server.dao.yunteng.mapper.DataComponentMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
-import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
+import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper, TkDataBoardEntity>
-    implements YtDataBoardService {
+    implements TkDataBoardService {
   private final OrganizationMapper organizationMapper;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final DataComponentMapper dataComponentMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDataComponentServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDataComponentServiceImpl.java
View file @d401024
@@ -14,7 +14,7 @@ import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.dao.yunteng.entities.TkDataComponentEntity;
 import org.thingsboard.server.dao.yunteng.mapper.DataComponentMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtDataComponentService;
+import org.thingsboard.server.dao.yunteng.service.TkDataComponentService;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 @Service
 public class TkDataComponentServiceImpl
     extends AbstractBaseService<DataComponentMapper, TkDataComponentEntity>
-    implements YtDataComponentService {
+    implements TkDataComponentService {
   @Override
   public List<DataComponentDTO> getDataComponentsByBoardId(String tenantId, String boardId) {
     List<TkDataComponentEntity> dataComponentList =
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
View file @d401024
@@ -21,7 +21,7 @@ import org.thingsboard.server.dao.yunteng.jpa.dao.YtJpaDeviceProfileDao;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import java.util.*;
@@ -30,7 +30,7 @@ import java.util.*;
 @Slf4j
 public class TkDeviceProfileServiceImpl
     extends AbstractBaseService<TkDeviceProfileMapper, TkDeviceProfileEntity>
-    implements YtDeviceProfileService {
+    implements TkDeviceProfileService {
   private final DeviceMapper deviceMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @d401024
@@ -19,7 +19,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceScriptMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceScriptService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import java.util.List;
 import java.util.Optional;
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @Slf4j
 public class TkDeviceScriptServiceImpl extends AbstractBaseService<TkDeviceScriptMapper, TkDeviceScriptEntity>
-        implements YtDeviceScriptService {
+        implements TkDeviceScriptService {
   private final TkDeviceProfileMapper profileMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
View file @d401024
@@ -30,7 +30,7 @@ import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @Slf4j
 public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDevice>
-    implements YtDeviceService {
+    implements TkDeviceService {
   private final DeviceProfileDao deviceProfileDao;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceTypeServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceTypeServiceImpl.java
View file @d401024
@@ -13,13 +13,13 @@ import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceTypeEntity;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceTypeMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtDeviceTypeService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceTypeService;
 import java.util.List;
 @Service
 public class TkDeviceTypeServiceImpl extends AbstractBaseService<DeviceTypeMapper, TkDeviceTypeEntity>
-    implements YtDeviceTypeService {
+    implements TkDeviceTypeService {
   @Override
   public List<DeviceTypeDTO> getDeviceTypeTree(String tenantId) {
     if (StringUtils.isEmpty(tenantId)) {
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkFrpInfoServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkFrpInfoServiceImpl.java
View file @d401024
@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkFrpInfoEntity;
 import org.thingsboard.server.dao.yunteng.mapper.FrpInfoMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtFrpInfoService;
+import org.thingsboard.server.dao.yunteng.service.TkFrpInfoService;
 import java.net.UnknownHostException;
 import java.time.LocalDateTime;
@@ -26,7 +26,7 @@ import java.util.Optional;
 @Service
 @RequiredArgsConstructor
 public class TkFrpInfoServiceImpl extends AbstractBaseService<FrpInfoMapper, TkFrpInfoEntity>
-    implements YtFrpInfoService {
+    implements TkFrpInfoService {
   private final FrpServerProperties frpServerProperties;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkHomePageServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkHomePageServiceImpl.java
View file @d401024
@@ -31,8 +31,8 @@ import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkAlarmMapper;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
-import org.thingsboard.server.dao.yunteng.service.YtTenantService;
-import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.dao.yunteng.service.TkTenantService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -50,7 +50,7 @@ public class TkHomePageServiceImpl implements HomePageService {
     private final DeviceMapper deviceMapper;
-    private final YtTenantService tenantService;
+    private final TkTenantService tenantService;
     private final UserMapper userMapper;
@@ -60,7 +60,7 @@ public class TkHomePageServiceImpl implements HomePageService {
     private final TimeseriesService timeseriesService;
-    private final YtUserService ytUserService;
+    private final TkUserService tkUserService;
     private final TkAlarmMapper ytJpaAarmDao;
@@ -380,7 +380,7 @@ public class TkHomePageServiceImpl implements HomePageService {
                     tsValueCompletableFuture = tenantService.findTenantsByTs(startTime, endTime, ts);
                 }
                 if (trend == TrendType.CUSTOMER_TREND) {
-                    tsValueCompletableFuture = ytUserService.findUsersAsyncByTs(startTime, endTime, ts);
+                    tsValueCompletableFuture = tkUserService.findUsersAsyncByTs(startTime, endTime, ts);
                 }
             }
             futures.add(tsValueCompletableFuture);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkMailLogServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkMailLogServiceImpl.java
View file @d401024
@@ -11,7 +11,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkMailLogEntity;
 import org.thingsboard.server.dao.yunteng.mapper.MaiLogMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtMailLogService;
+import org.thingsboard.server.dao.yunteng.service.TkMailLogService;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -22,7 +22,7 @@ import java.util.Set;
 @Service
 @RequiredArgsConstructor
 public class TkMailLogServiceImpl extends AbstractBaseService<MaiLogMapper, TkMailLogEntity>
-    implements YtMailLogService {
+    implements TkMailLogService {
   @Override
   public YtPageData<MailLogDTO> page(String tenantId, Map<String, Object> queryMap) {
     DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkMailServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkMailServiceImpl.java
View file @d401024
@@ -24,7 +24,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkMessageTemplateEntity;
 import org.thingsboard.server.dao.yunteng.mapper.MaiLogMapper;
 import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
 import org.thingsboard.server.dao.yunteng.mapper.MessageTemplateMapper;
-import org.thingsboard.server.dao.yunteng.service.YtMailService;
+import org.thingsboard.server.dao.yunteng.service.TkMailService;
 import java.io.File;
 import java.io.IOException;
@@ -35,7 +35,7 @@ import java.util.Properties;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class TkMailServiceImpl implements YtMailService {
+public class TkMailServiceImpl implements TkMailService {
   private final MessageTemplateMapper messageTemplateMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkMessageConfigServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkMessageConfigServiceImpl.java
View file @d401024
@@ -16,7 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkMessageConfigEntity;
 import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtMessageConfigService;
+import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
 import java.util.List;
 import java.util.Map;
@@ -27,7 +27,7 @@ import java.util.Set;
 @RequiredArgsConstructor
 public class TkMessageConfigServiceImpl
     extends AbstractBaseService<MessageConfigMapper, TkMessageConfigEntity>
-    implements YtMessageConfigService {
+    implements TkMessageConfigService {
   @Override
   public YtPageData<MessageConfigDTO> page(String tenantId, Map<String, Object> queryMap) {
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkMessageTemplateServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkMessageTemplateServiceImpl.java
View file @d401024
@@ -13,7 +13,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkMessageTemplateEntity;
 import org.thingsboard.server.dao.yunteng.mapper.MessageTemplateMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtMessageTemplateService;
+import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
 import java.util.List;
 import java.util.Map;
@@ -24,7 +24,7 @@ import java.util.Set;
 @RequiredArgsConstructor
 public class TkMessageTemplateServiceImpl
     extends AbstractBaseService<MessageTemplateMapper, TkMessageTemplateEntity>
-    implements YtMessageTemplateService {
+    implements TkMessageTemplateService {
   @Override
   public YtPageData<MessageTemplateDTO> page(Map<String, Object> queryMap) {
     IPage<TkMessageTemplateEntity> configIPage = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME,false);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkNoticeServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkNoticeServiceImpl.java
View file @d401024
@@ -7,12 +7,12 @@ import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.EmailReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO;
 import org.thingsboard.server.common.data.yunteng.enums.*;
-import org.thingsboard.server.common.data.yunteng.utils.YtDateTimeUtils;
+import org.thingsboard.server.common.data.yunteng.utils.DateTimeUtils;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
-import org.thingsboard.server.dao.yunteng.service.YtMailService;
-import org.thingsboard.server.dao.yunteng.service.YtNoticeService;
-import org.thingsboard.server.dao.yunteng.service.YtSmsService;
+import org.thingsboard.server.dao.yunteng.service.TkMailService;
+import org.thingsboard.server.dao.yunteng.service.TkNoticeService;
+import org.thingsboard.server.dao.yunteng.service.TkSmsService;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-public class TkNoticeServiceImpl implements YtNoticeService {
+public class TkNoticeServiceImpl implements TkNoticeService {
     private final DeviceMapper deviceMapper;
     private final OrganizationMapper organizationMapper;
@@ -37,8 +37,8 @@ public class TkNoticeServiceImpl implements YtNoticeService {
     private final AlarmContactMapper alarmContactMapper;
     private final MessageTemplateMapper messageTemplateMapper;
-    private final YtSmsService smsService;
-    private final YtMailService mailService;
+    private final TkSmsService smsService;
+    private final TkMailService mailService;
     @Override
     public void alert(String profileId, AlarmInfoDTO alarmInfo) {
@@ -145,7 +145,7 @@ public class TkNoticeServiceImpl implements YtNoticeService {
         params.put("device_name", alarmInfo.getDeviceName());
         params.put("severity", alarmInfo.getSeverity());
         params.put("organization", organization != null ? organization.getName() : "");
-        params.put("createtime", YtDateTimeUtils.formate(alarmInfo.getCreateTs()));
+        params.put("createtime", DateTimeUtils.format(alarmInfo.getCreateTs()));
         info.setParams(params);
         contacts.stream().parallel().forEach(item -> {
             if (!item.getPhone().isEmpty()) {
@@ -175,7 +175,7 @@ public class TkNoticeServiceImpl implements YtNoticeService {
             info.setTo(emailReceivers.toArray(new String[emailReceivers.size()]));
             info.setSubject(String.format("【%s】告警通知", alarmInfo.getDeviceName()));
             String body = String.format("%s位于【%s】的设备【%s】触发【%s】级的【%s】，请尽快处理！"
-                    , YtDateTimeUtils.formate(alarmInfo.getCreateTs())
+                    , DateTimeUtils.format(alarmInfo.getCreateTs())
                     , organization != null ? organization.getName() : ""
                     , alarmInfo.getDeviceName()
                     , alarmInfo.getSeverity()
@@ -207,7 +207,7 @@ public class TkNoticeServiceImpl implements YtNoticeService {
         params.put("device_name", alarmInfo.getDeviceName());
         params.put("severity", alarmInfo.getSeverity());
         params.put("organization", organization != null ? organization.getName() : "");
-        params.put("createtime", YtDateTimeUtils.formate(alarmInfo.getCreateTs()));
+        params.put("createtime", DateTimeUtils.format(alarmInfo.getCreateTs()));
         info.setParams(params);
         info.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_ALARM_NOTICE.name());
         contacts.stream().parallel().forEach(item -> {
@@ -237,7 +237,7 @@ public class TkNoticeServiceImpl implements YtNoticeService {
         params.put("device_name", alarmInfo.getDeviceName());
         params.put("severity", alarmInfo.getSeverity());
         params.put("organization", organization != null ? organization.getName() : "");
-        params.put("createtime", YtDateTimeUtils.formate(alarmInfo.getCreateTs()));
+        params.put("createtime", DateTimeUtils.format(alarmInfo.getCreateTs()));
         info.setParams(params);
         info.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_ALARM_NOTICE.name());
         contacts.stream().parallel().forEach(item -> {
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkOpinionServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkOpinionServiceImpl.java
View file @d401024
@@ -23,7 +23,7 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor
 public class TkOpinionServiceImpl extends AbstractBaseService<TkOpinionMapper, TkOpinionEntity>
-    implements YtOpinionService {
+    implements TkOpinionService {
   private final UserOrganizationMappingService userOrganizationMappingService;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkOrganizationServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkOrganizationServiceImpl.java
View file @d401024
@@ -18,7 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtOrganizationService;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationMapper, TkOrganizationEntity>
-    implements YtOrganizationService {
+    implements TkOrganizationService {
   private final UserOrganizationMappingMapper userOrganizationMappingMapper;
   private final UserMapper userMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkReportFromConfigServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkReportFromConfigServiceImpl.java
View file @d401024
@@ -33,10 +33,10 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkReportFromConfigServiceImpl
     extends AbstractBaseService<ReportFormConfigMapper, TkReportFormConfigEntity>
-    implements YtReportFormConfigService {
+    implements TkReportFormConfigService {
   private final OrganizationMapper organizationMapper;
-  private final YtSysJobService ytSysJobService;
-  private final YtReportGenerateRecordService ytReportGenerateRecordService;
+  private final TkSysJobService tkSysJobService;
+  private final TkReportGenerateRecordService tkReportGenerateRecordService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   @Override
@@ -196,14 +196,14 @@ public class TkReportFromConfigServiceImpl
         Objects.equals(reportFormConfig.getExecuteWay(), FastIotConstants.MagicNumber.ZERO);
     String cronExpression = reportFormConfig.getExecuteContent();
     // 查看之前是否创建了定时任务
-    SysJobDTO sysJobDTO = ytSysJobService.findSysJobBySourceId(reportFormConfig.getId());
+    SysJobDTO sysJobDTO = tkSysJobService.findSysJobBySourceId(reportFormConfig.getId());
     boolean enableStatus =
         Objects.equals(reportFormConfig.getStatus(), StatusEnum.ENABLE.getIndex());
     if (null != sysJobDTO) {
       // 立即执行
       if (isNowExecute) {
         // 删除定时任务
-        ytSysJobService.deleteJob(sysJobDTO);
+        tkSysJobService.deleteJob(sysJobDTO);
         if (enableStatus) {
           // 立即执行报表生成，并创建一条报表执行记录
           // 生成Excel,并更新报表执行记录
@@ -216,7 +216,7 @@ public class TkReportFromConfigServiceImpl
             reportFormConfig.getStatus() == null
                 ? StatusEnum.DISABLE.getIndex()
                 : reportFormConfig.getStatus());
-        ytSysJobService.saveOrUpdateJob(sysJobDTO);
+        tkSysJobService.saveOrUpdateJob(sysJobDTO);
       }
     } else {
       if (isNowExecute) {
@@ -236,7 +236,7 @@ public class TkReportFromConfigServiceImpl
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     // 检查cron表达式是否标准
-    if (!ytSysJobService.checkCronExpressionIsValid(cronExpression)) {
+    if (!tkSysJobService.checkCronExpressionIsValid(cronExpression)) {
       throw new YtDataValidationException(ErrorMessage.CRON_INVALID.getMessage());
     }
   }
@@ -259,7 +259,7 @@ public class TkReportFromConfigServiceImpl
       sysJobDTO.setCronExpression(cronExpression);
       sysJobDTO.setConcurrent(StatusEnum.ENABLE.getIndex());
       sysJobDTO.setInvokeTarget("reportTask.generateReport(\"" + reportId + "\")");
-      ytSysJobService.saveOrUpdateJob(sysJobDTO);
+      tkSysJobService.saveOrUpdateJob(sysJobDTO);
     }
   }
@@ -271,9 +271,9 @@ public class TkReportFromConfigServiceImpl
   private void checkAndDeleteJob(String id) throws SchedulerException {
     TkReportFormConfigEntity config = baseMapper.selectById(id);
     if (null != config) {
-      SysJobDTO sysJobDTO = ytSysJobService.findSysJobBySourceId(id);
+      SysJobDTO sysJobDTO = tkSysJobService.findSysJobBySourceId(id);
       if (null != sysJobDTO) {
-        ytSysJobService.deleteJob(sysJobDTO);
+        tkSysJobService.deleteJob(sysJobDTO);
       }
     }
   }
@@ -299,11 +299,11 @@ public class TkReportFromConfigServiceImpl
     }
     // 立即执行报表生成，并创建一条报表执行记录
     ReportGenerateRecordDTO recordDTO =
-        ytReportGenerateRecordService.generateReportRecord(reportFormConfigDTO, null);
+        tkReportGenerateRecordService.generateReportRecord(reportFormConfigDTO, null);
     // 生成Excel,并更新报表执行记录
     int surplus = reportFormConfigDTO.getExecuteAttributes().size();
     for (ExecuteAttributesDTO dto : reportFormConfigDTO.getExecuteAttributes()) {
-      ytReportGenerateRecordService.generateExcelUpdateReportRecord(
+      tkReportGenerateRecordService.generateExcelUpdateReportRecord(
           reportFormConfigDTO, dto, recordDTO.getId(), surplus);
       surplus--;
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkReportGenerateRecordServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkReportGenerateRecordServiceImpl.java
View file @d401024
@@ -38,8 +38,8 @@ import org.thingsboard.server.dao.yunteng.entities.TkReportGenerateRecordEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ReportGenerateRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
-import org.thingsboard.server.dao.yunteng.service.YtOrganizationService;
-import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
+import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -56,11 +56,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TkReportGenerateRecordServiceImpl
     extends AbstractBaseService<ReportGenerateRecordMapper, TkReportGenerateRecordEntity>
-    implements YtReportGenerateRecordService {
+    implements TkReportGenerateRecordService {
   private static final String CONTENT_TYPE =
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-  private final YtOrganizationService ytOrganizationService;
+  private final TkOrganizationService tkOrganizationService;
   private final TimeseriesService tsService;
   private final FileStorageService fileStorageService;
   private final UserOrganizationMappingService userOrganizationMappingService;
@@ -149,7 +149,7 @@ public class TkReportGenerateRecordServiceImpl
       throw new YtDataValidationException(ErrorMessage.EXPORT_CONFIG_NON_EXISTENT.getMessage());
     }
     OrganizationDTO organizationDTO =
-        ytOrganizationService.findOrganizationById(
+        tkOrganizationService.findOrganizationById(
             reportFormConfigDTO.getOrganizationId(), reportFormConfigDTO.getTenantId());
     // 创建报表生成记录
     ReportGenerateRecordDTO dto = new ReportGenerateRecordDTO();
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRpcRecordServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRpcRecordServiceImpl.java
View file @d401024
@@ -12,7 +12,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkRpcRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtRpcRecordService;
+import org.thingsboard.server.dao.yunteng.service.TkRpcRecordService;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class TkRpcRecordServiceImpl extends AbstractBaseService<TkRpcRecordMapper, TkRpcRecordEntity>
-        implements YtRpcRecordService {
+        implements TkRpcRecordService {
     private final OrganizationMapper organizationMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRuleChainServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRuleChainServiceImpl.java
View file @d401024
@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.dao.service.Validator;
 import org.thingsboard.server.dao.yunteng.jpa.dao.YtJpaRuleChainDao;
-import org.thingsboard.server.dao.yunteng.service.YtRuleChainService;
+import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
 import java.util.List;
@@ -23,7 +23,7 @@ import java.util.List;
  */
 @Service
 @RequiredArgsConstructor
-public class TkRuleChainServiceImpl implements YtRuleChainService {
+public class TkRuleChainServiceImpl implements TkRuleChainService {
     private final YtJpaRuleChainDao ruleChainDao;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSmsServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSmsServiceImpl.java
View file @d401024
@@ -31,7 +31,7 @@ import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
 import org.thingsboard.server.dao.yunteng.mapper.MessageTemplateMapper;
 import org.thingsboard.server.dao.yunteng.mapper.SmsLogMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
-import org.thingsboard.server.dao.yunteng.service.YtSmsService;
+import org.thingsboard.server.dao.yunteng.service.TkSmsService;
 import java.time.LocalDateTime;
 import java.util.LinkedHashMap;
@@ -43,7 +43,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstan
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class TkSmsServiceImpl implements YtSmsService {
+public class TkSmsServiceImpl implements TkSmsService {
   private final MessageTemplateMapper messageTemplateMapper;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkTenantServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkTenantServiceImpl.java
View file @d401024
@@ -30,20 +30,20 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTenantEntity>
-        implements YtTenantService {
+        implements TkTenantService {
     private final MenuMapper menuMapper;
     private final RoleMapper roleMapper;
     private final UserMapper userMapper;
     private final TenantMenuMapper tenantMenuMapper;
     private final TenantRoleMapper tenantRoleMapper;
-    private final YtOrganizationService ytOrganizationService;
-    private final YtDeviceService ytDeviceService;
-    private final YtMessageTemplateService ytMessageTemplateService;
-    private final YtMessageConfigService ytMessageConfigService;
-    private final YtMailLogService ytMailLogService;
+    private final TkOrganizationService tkOrganizationService;
+    private final TkDeviceService ytDeviceService;
+    private final TkMessageTemplateService tkMessageTemplateService;
+    private final TkMessageConfigService ytMessageConfigService;
+    private final TkMailLogService ytMailLogService;
     private final SmsLogService smsLogService;
-    private final YtAlarmContactService ytAlarmContactService;
+    private final TkAlarmContactService ytAlarmContactService;
     private final AlarmProfileMapper alarmProfileMapper;
     private final SysNoticeService sysNoticeService;
     private final SysNoticeUserService sysNoticeUserService;
@@ -137,11 +137,11 @@ public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTe
         // 5. TELL RULE ENGINE TO STOP TENANT
         // 6. DELETE OTHER RESOURCES IF ANY
         // 7. DELETE ORGANIZATION
-        ytOrganizationService.deleteDataByTenantIds(tenantIds);
+        tkOrganizationService.deleteDataByTenantIds(tenantIds);
         // 8. DELETE DEVICE
         ytDeviceService.deleteDataByTenantIds(tenantIds);
         // 9. DELETE MESSAGE_TEMPLATE MESSAGE_CONFIG SEND_RECORDS
-        ytMessageTemplateService.deleteDataByTenantIds(tenantIds);
+        tkMessageTemplateService.deleteDataByTenantIds(tenantIds);
         ytMessageConfigService.deleteDataByTenantIds(tenantIds);
         ytMailLogService.deleteDataByTenantIds(tenantIds);
         smsLogService.deleteDataByTenantIds(tenantIds);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkThirdPlatformServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkThirdPlatformServiceImpl.java
View file @d401024
@@ -31,7 +31,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkThirdPlatformMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
+import org.thingsboard.server.dao.yunteng.service.TkThirdPlatformService;
 import java.util.Objects;
 import java.util.Optional;
@@ -43,7 +43,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstan
 @Service
 @RequiredArgsConstructor
 public class TkThirdPlatformServiceImpl extends AbstractBaseService<TkThirdPlatformMapper, TkThirdUserEntity>
-        implements YtThirdPlatformService {
+        implements TkThirdPlatformService {
     private final UserMapper userMapper;
     private final CacheUtils cacheUtils;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkVideoPlatformServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkVideoPlatformServiceImpl.java
View file @d401024
@@ -17,8 +17,8 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoPlatformEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkVideoPlatformMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtVideoPlatformService;
-import org.thingsboard.server.dao.yunteng.service.YtVideoService;
+import org.thingsboard.server.dao.yunteng.service.TkVideoPlatformService;
+import org.thingsboard.server.dao.yunteng.service.TkVideoService;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,9 +27,9 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class TkVideoPlatformServiceImpl extends AbstractBaseService<TkVideoPlatformMapper, TkVideoPlatformEntity>
-        implements YtVideoPlatformService {
+        implements TkVideoPlatformService {
-    private final YtVideoService ytVideoService;
+    private final TkVideoService tkVideoService;
     @Override
     public YtPageData<TkVideoPlatformDTO> page(IPage<TkVideoPlatformEntity> pageInfo,
@@ -68,7 +68,7 @@ public class TkVideoPlatformServiceImpl extends AbstractBaseService<TkVideoPlatf
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteDataByIds(DeleteDTO deleteDTO) {
-        boolean result = ytVideoService.checkConfigIdsIsUseForVideo(deleteDTO.getIds());
+        boolean result = tkVideoService.checkConfigIdsIsUseForVideo(deleteDTO.getIds());
         if(result){
             throw new YtDataValidationException(ErrorMessage.VIDEO_PLATFORM_USED.getMessage());
         }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkVideoServiceImpl.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkVideoServiceImpl.java
View file @d401024
@@ -21,7 +21,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkVideoMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
-import org.thingsboard.server.dao.yunteng.service.YtVideoService;
+import org.thingsboard.server.dao.yunteng.service.TkVideoService;
 import java.util.List;
 import java.util.Set;
@@ -30,7 +30,7 @@ import java.util.Set;
 @Service
 @RequiredArgsConstructor
 public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVideoEntity>
-        implements YtVideoService {
+        implements TkVideoService {
     private final UserOrganizationMappingService userOrganizationMappingService;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkAlarmContactService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtAlarmContactService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkAlarmContactService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtAlarmContactService.java
View file @d401024
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 /** @Description 告警联系人的操作方法 @Author cxy @Date 2021/11/2 14:46 */
-public interface YtAlarmContactService extends BaseService<TkAlarmContactEntity> {
+public interface TkAlarmContactService extends BaseService<TkAlarmContactEntity> {
   /**
    * 查询全部的告警联系人
    *
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkAlarmInfoService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtAlarmInfoService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkAlarmInfoService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtAlarmInfoService.java
View file @d401024
@@ -16,7 +16,7 @@ import java.util.UUID;
 /**
  * @Description 告警中心数据业务层 @Author cxy @Date 2021/11/10 16:51
  */
-public interface YtAlarmInfoService {
+public interface TkAlarmInfoService {
     /**
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkAlarmService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtAlarmService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkAlarmService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtAlarmService.java
View file @d401024
@@ -13,7 +13,7 @@ import java.util.Map;
  * @Date 2021/11/2 14:46
  */
-public interface YtAlarmService {
+public interface TkAlarmService {
     /**
      * 查询全部的告警联系人
      *
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationActService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationActService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationActService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationActService.java
View file @d401024
@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @author Administrator
  */
-public interface YtConfigurationActService {
+public interface TkConfigurationActService {
     /**
      * 保存节点动画效果信息，每种事件类型只会有1个
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationCenterService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationCenterService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationCenterService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationCenterService.java
View file @d401024
@@ -7,7 +7,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import java.util.Map;
-public interface YtConfigurationCenterService {
+public interface TkConfigurationCenterService {
   YtPageData<ConfigurationCenterDTO> page(Map<String, Object> queryMap,boolean tenantAdmin);
   ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationContentService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationContentService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationContentService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationContentService.java
View file @d401024
@@ -5,7 +5,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import java.util.Set;
-public interface YtConfigurationContentService {
+public interface TkConfigurationContentService {
   ConfigurationContentDTO saveConfigurationContent(ConfigurationContentDTO configurationContentDTO);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationDatasourceService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationDatasourceService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationDatasourceService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationDatasourceService.java
View file @d401024
@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * @author Administrator
  */
-public interface YtConfigurationDatasourceService {
+public interface TkConfigurationDatasourceService {
     /**
      * 保存节点数据源，只会有1个
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationEventService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationEventService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkConfigurationEventService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtConfigurationEventService.java
View file @d401024
@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @author Administrator
  */
-public interface YtConfigurationEventService {
+public interface TkConfigurationEventService {
     /**
      * 保存节点数据交互信息，每种事件类型只会有1个
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDataBoardService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDataBoardService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDataBoardService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDataBoardService.java
View file @d401024
@@ -8,7 +8,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import java.util.List;
 import java.util.Map;
-public interface YtDataBoardService {
+public interface TkDataBoardService {
   /**
    * 数据看板分页
    *
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDataComponentService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDataComponentService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDataComponentService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDataComponentService.java
View file @d401024
@@ -6,7 +6,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import java.util.List;
 import java.util.Set;
-public interface YtDataComponentService {
+public interface TkDataComponentService {
   /**
    * 查询数据看板下的所有组件
    * @param tenantId 租户id
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceProfileService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceProfileService.java
View file @d401024
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-public interface YtDeviceProfileService {
+public interface TkDeviceProfileService {
     DeviceProfileDTO insertOrUpdate(DeviceProfileDTO deviceDTO);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceScriptService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceScriptService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceScriptService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceScriptService.java
View file @d401024
@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-public interface YtDeviceScriptService  extends BaseService<TkDeviceScriptEntity>{
+public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity>{
     /**
      * 查找脚本解析的脚本内容
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceService.java
View file @d401024
@@ -14,7 +14,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-public interface YtDeviceService extends BaseService<TkDevice> {
+public interface TkDeviceService extends BaseService<TkDevice> {
     DeviceDTO insertOrUpdate(String tenantId, DeviceDTO deviceDTO);
     void deleteDevices(String tenantId, Set<String> ids);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceTypeService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceTypeService.java
View file @d401024
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceTypeService.java renamed from dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceTypeService.java
View file @d401024
@@ -6,7 +6,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceTypeDTO;
 import java.util.List;
-public interface YtDeviceTypeService {
+public interface TkDeviceTypeService {
     /**
      * 获取当前租户设备类型的树形结构
      * @param tenantId 租户Code