Merge branch 'microservice_fix' into 'master_dev'

fix: 微服务兼容问题

See merge request yunteng/thingskit!407

@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,6 +23,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/alarm/profile")
 @Api(tags = {"告警配置"})
 @RequiredArgsConstructor

@@ -27,12 +27,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
 @RequestMapping("api/yt/homepage")
 @Api(tags = {"首页"})
 @RequiredArgsConstructor
 @RestController
+@TbCoreComponent
 public class HomePageController extends BaseController {
 
   private final HomePageService homePageService;

@@ -32,9 +32,11 @@ import org.thingsboard.server.dao.util.yunteng.CronUtils;
 import org.thingsboard.server.dao.util.yunteng.ScheduleUtils;
 import org.thingsboard.server.dao.yunteng.service.TkSysJobService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 /** 调度任务信息操作处理 */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/monitor/job")
 @RequiredArgsConstructor
 @Api(tags = {"定时任务"})

@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -25,6 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 
 /** 调度日志操作处理 */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/monitor/job_log")
 @RequiredArgsConstructor
 @Api(tags = {"定时任务执行日志"})

@@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService;
 import org.thingsboard.server.utils.ImportModbusUtils;
 
@@ -48,6 +49,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/things_model")
 @Api(tags = {"物模型管理"})

@@ -36,6 +36,7 @@ import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.tenant.TbTenantService;
 import org.thingsboard.server.service.entitiy.user.TbUserService;
 import org.thingsboard.server.service.install.InstallScripts;
@@ -51,6 +52,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/admin")
 @Api(tags = {"租户管理", "菜单管理"})
 @RequiredArgsConstructor

@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkAlarmContactService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -36,6 +37,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @Description 告警联系人 @Author cxy @Date 2021/11/2 14:54
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/alarm_contact")
 @RequiredArgsConstructor
 @Api(tags = "告警联系人")

@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity;
 import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @Description 告警中心 @Author cxy @Date 2021/11/11 9:23
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/alarm")
 @RequiredArgsConstructor
 @Api(tags = "告警中心")

@@ -9,6 +9,7 @@ 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.TkNoticeService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
 
 import java.net.InetAddress;
@@ -24,6 +25,7 @@ import java.net.InetAddress;
  * @Copyright 2016-2018  - Powered By 云腾五洲
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/notice")
 @RequiredArgsConstructor
 @Slf4j

@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 /**
  * @author: 徐浩然
@@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
  */
 @Api(tags = "APP定制")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/app_design")
 @RequiredArgsConstructor
 public class TkAppDesignController extends BaseController {

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.dao.yunteng.service.SysAreaService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.List;
 
@@ -19,6 +20,7 @@ import java.util.List;
  */
 @Api(tags = "中国省市区街关联")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/area")
 @RequiredArgsConstructor
 public class TkAreaController {

@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationCenterService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +31,7 @@ import java.util.List;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/configuration/center")
 @RequiredArgsConstructor
 @Api(tags = "组态中心")

@@ -15,8 +15,10 @@ 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.TkConfigurationContentService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/configuration/content")
 @RequiredArgsConstructor
 @Api(tags = "组态内容")

@@ -22,11 +22,13 @@ import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentNodeService;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 /**
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/new/configuration/node")
 @RequiredArgsConstructor
 @Api(tags = "组态结点管理(新)")

@@ -15,6 +15,7 @@ import org.thingsboard.server.controller.BaseController;
 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 org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.List;
 import java.util.Optional;
@@ -23,6 +24,7 @@ import java.util.Optional;
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/configuration/node")
 @RequiredArgsConstructor
 @Api(tags = "组态结点管理")

@@ -40,10 +40,12 @@ 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.TkRuleChainService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rule.TbRuleChainService;
 import org.thingsboard.server.service.security.permission.Operation;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/convert")
 @Api(tags = {"数据流转控制器"})

@@ -23,12 +23,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.*;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/data_board")
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")

@@ -24,11 +24,13 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
 import org.thingsboard.server.dao.yunteng.service.TkDataComponentService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 @RequestMapping("api/yt/data_component")

@@ -15,11 +15,13 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewContentService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 /**
  * @author tianfuLei
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/data_view/content")
 @RequiredArgsConstructor
 @Api(tags = "大屏内容")

@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author tianfuLei
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/data_view")
 @RequiredArgsConstructor
 @Api(tags = "大屏设计器")

@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TkSystemTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewInterfaceService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.*;
 
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author tianfuLei
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/data_view_interface")
 @RequiredArgsConstructor
 @Api(tags = "大屏公共接口")

@@ -19,12 +19,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceAccessInformationService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device_profile/access_information")
 @Api(tags = {"设备接入信息管理"})

@@ -40,6 +40,7 @@ import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
 import org.thingsboard.server.service.entitiy.device.TbDeviceService;
 import org.thingsboard.server.service.entitiy.entity.relation.TbEntityRelationService;
@@ -55,6 +56,7 @@ import java.util.concurrent.ExecutionException;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device")
 @Api(tags = {"设备管理"})

@@ -15,12 +15,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileCategoryService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device_profile/category")
 @Api(tags = {"产品品类管理"})

@@ -34,6 +34,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService;
 import org.thingsboard.server.service.security.permission.Operation;
 
@@ -45,6 +46,7 @@ import java.util.concurrent.ExecutionException;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device_profile")
 @Api(tags = {"设备配置管理"})

@@ -30,6 +30,8 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +40,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/js")
 @Api(tags = {"设备数据解析脚本管理"})

@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceStateLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device/state/log")
 @Api(tags = {"设备上下线记录"})

@@ -17,10 +17,12 @@ 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.TkDeviceTypeService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.List;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/device_type")
 @RequiredArgsConstructor
 @Api(value = "设备类型")

@@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysDictService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/dict")
 @RequiredArgsConstructor
 @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")

@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysDictItemService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.List;
@@ -25,6 +26,7 @@ import java.util.Map;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/dict_item")
 @RequiredArgsConstructor
 public class TkDictItemController extends BaseController {

@@ -10,6 +10,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 /**
  * @author: 徐浩然
@@ -18,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
  */
 @Api(tags = "企业信息")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/enterprise")
 @RequiredArgsConstructor
 public class TkEnterpriseController extends BaseController {

@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.event.TkEventsService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.UUID;
 
@@ -25,6 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/event")
 @Api(tags = {"设备事件"})
 @RequiredArgsConstructor

@@ -8,8 +8,10 @@ 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.TkFrpInfoService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/frp")
 @Api(tags = "Frp内网穿透信息")
 @RequiredArgsConstructor

@@ -11,12 +11,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkMailLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/mail_log")
 @RequiredArgsConstructor
 public class TkMailLogController extends BaseController {

@@ -10,8 +10,10 @@ import org.thingsboard.server.common.data.yunteng.dto.TkMapGeoJsonDTO;
 import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.dao.yunteng.service.TkMapGeoJsonService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/map/geo_json")
 @RequiredArgsConstructor
 @Api(tags = "行政区域经纬度信息")

@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.net.URI;
 import java.util.List;
@@ -19,6 +20,7 @@ import java.util.Optional;
 import java.util.Set;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/menu")
 public class TkMenuController extends BaseController {

@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.List;
@@ -24,6 +25,7 @@ import java.util.List;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/message")
 @RequiredArgsConstructor
 public class TkMessageConfigController extends BaseController {

@@ -14,12 +14,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkMessageLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/message_log")
 @RequiredArgsConstructor
 public class TkMessageLogController extends BaseController {

@@ -25,12 +25,14 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkMailService;
 import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
 import org.thingsboard.server.dao.yunteng.service.TkMessageService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/template")
 @RequiredArgsConstructor
 public class TkMessageTemplateController extends BaseController {

@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.dao.yunteng.service.*;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.net.UnknownHostException;
 import java.util.List;
@@ -29,6 +30,7 @@ import java.util.Optional;
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/noauth")
 @RequiredArgsConstructor
 public class TkNoAuthController {

@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysNoticeService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  */
 @Api(tags = "通知管理")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/notice")
 @RequiredArgsConstructor
 public class TkNoticeController extends BaseController {

@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,6 +25,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  */
 @Api(tags = "我的通知")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/notice_user")
 @RequiredArgsConstructor
 public class TkNoticeUserController extends BaseController {

@@ -16,10 +16,12 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkOpinionEntity;
 import org.thingsboard.server.dao.yunteng.service.TkOpinionService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/opinion")
 @Api(tags = {"意见反馈"})
 @RequiredArgsConstructor

@@ -16,12 +16,14 @@ 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.TkOrganizationService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/organization")
 @Api(tags = "组织管理")
 @RequiredArgsConstructor

@@ -8,11 +8,13 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.utils.FileStorageService;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/oss")
 public class TkOssFileController {
 

@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 /**
  * @author: 徐浩然
@@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
  */
 @Api(tags = "平台定制")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/platform")
 @RequiredArgsConstructor
 public class TkPlatformDesignController extends BaseController {

@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/report_form/config")
 @Api(tags = "报表配置信息")
 @RequiredArgsConstructor

@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@ import java.util.Map;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/report/generate/record")
 @Api(tags = "报表生成记录")
 @RequiredArgsConstructor

@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.RoleService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,6 +23,7 @@ import java.util.Set;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/role")
 @RequiredArgsConstructor
 public class TkRoleController extends BaseController {

@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity;
 import org.thingsboard.server.dao.yunteng.service.TkRpcRecordService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.sql.Timestamp;
 
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/rpc")
 @Api(tags = {"命令下发记录"})
 @RequiredArgsConstructor

@@ -8,11 +8,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.dao.yunteng.service.rtsp.TkFLVService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/rtsp")
 @Api(tags = {"rtsp流转换"})
 @RequiredArgsConstructor

@@ -12,8 +12,10 @@ 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.TkRuleChainService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/rule_chain")
 @Api(tags = {"规则链管理"})

@@ -26,6 +26,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.yunteng.aspect.annotation.AutoLog;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.net.URI;
 import java.util.*;
@@ -35,6 +36,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 
 /** @Description 场景联动 @Author cxy @Date 2021/11/25 11:25 */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/scene_linkage")
 @RequiredArgsConstructor
 @Api(tags = "场景联动")

@@ -12,8 +12,10 @@ import org.thingsboard.server.common.data.yunteng.enums.ShareViewType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkShareViewService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/share")
 @Api(tags = {"分享的视图"})

@@ -17,10 +17,12 @@ 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.TkSysLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/log")
 @Api(tags = {"日志管理"})
 @RequiredArgsConstructor

@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 
@@ -29,6 +30,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/task_center")
 @Api(tags = {"任务中心"})
 @RequiredArgsConstructor

@@ -15,12 +15,14 @@ import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordE
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
 import java.util.UUID;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/tenant")
 public class TkTenantController extends AbstractUserAccount {
 

@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.List;
 import java.util.UUID;
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/tenant_profiles")
 @RequiredArgsConstructor
 public class TkTenantProfilesController extends BaseController {

@@ -5,8 +5,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/noauth/test")
 public class TkTestController {
   @PostMapping

@@ -29,6 +29,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
 import org.thingsboard.server.dao.yunteng.service.TkThirdPlatformService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.yunteng.TkLoginResponse;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
@@ -45,6 +46,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/third")
 @Api(tags = {"第三方小程序"})
 @RequiredArgsConstructor

@@ -12,10 +12,12 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkUserCollectEntity;
 import org.thingsboard.server.dao.yunteng.service.TkUserCollectService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.List;
 
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/collect")
 @Api(tags = {"收藏功能"})

@@ -44,6 +44,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.entities.SysUserEntity;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.customer.TbCustomerService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -60,6 +61,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/user")
 @Api(value = "用户接口")
 public class TkUserController extends AbstractUserAccount {

@@ -22,6 +22,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/video/channel")
 @Api(tags = {"视频通道"})
 @RequiredArgsConstructor

@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
 import org.thingsboard.server.dao.yunteng.service.TkVideoService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -28,6 +29,7 @@ import java.util.Map;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/video")
 @Api(tags = {"视频流"})
 @RequiredArgsConstructor

@@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoPlatformEntity;
 import org.thingsboard.server.dao.yunteng.service.TkVideoPlatformService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.List;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/video/platform")
 @Api(tags = {"流媒体平台配置"})
 @RequiredArgsConstructor