简柏林 / thingskit · Commits

Commit 1b6aa66591548917599c1d182453f27d2abecc04

Authored by 李 俊亮
Committed by xp.Huang
1 parent b0cf5601

fix: 微服务兼容问题

Inline Side-by-side
Showing 65 changed files with 131 additions and 0 deletions
@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum; @@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
14 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 14 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
15 import org.thingsboard.server.controller.BaseController; 15 import org.thingsboard.server.controller.BaseController;
16 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService; 16 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
  17 +import org.thingsboard.server.queue.util.TbCoreComponent;
17 18
18 import java.util.HashMap; 19 import java.util.HashMap;
19 import java.util.List; 20 import java.util.List;
@@ -22,6 +23,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -22,6 +23,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
22 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE; 23 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
23 24
24 @RestController 25 @RestController
  26 +@TbCoreComponent
25 @RequestMapping("api/yt/alarm/profile") 27 @RequestMapping("api/yt/alarm/profile")
26 @Api(tags = {"告警配置"}) 28 @Api(tags = {"告警配置"})
27 @RequiredArgsConstructor 29 @RequiredArgsConstructor
@@ -27,12 +27,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -27,12 +27,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
27 import org.thingsboard.server.controller.BaseController; 27 import org.thingsboard.server.controller.BaseController;
28 import org.thingsboard.server.dao.exception.DataValidationException; 28 import org.thingsboard.server.dao.exception.DataValidationException;
29 import org.thingsboard.server.dao.yunteng.service.HomePageService; 29 import org.thingsboard.server.dao.yunteng.service.HomePageService;
  30 +import org.thingsboard.server.queue.util.TbCoreComponent;
30 import org.thingsboard.server.service.security.model.SecurityUser; 31 import org.thingsboard.server.service.security.model.SecurityUser;
31 32
32 @RequestMapping("api/yt/homepage") 33 @RequestMapping("api/yt/homepage")
33 @Api(tags = {"首页"}) 34 @Api(tags = {"首页"})
34 @RequiredArgsConstructor 35 @RequiredArgsConstructor
35 @RestController 36 @RestController
  37 +@TbCoreComponent
36 public class HomePageController extends BaseController { 38 public class HomePageController extends BaseController {
37 39
38 private final HomePageService homePageService; 40 private final HomePageService homePageService;
@@ -32,9 +32,11 @@ import org.thingsboard.server.dao.util.yunteng.CronUtils; @@ -32,9 +32,11 @@ import org.thingsboard.server.dao.util.yunteng.CronUtils;
32 import org.thingsboard.server.dao.util.yunteng.ScheduleUtils; 32 import org.thingsboard.server.dao.util.yunteng.ScheduleUtils;
33 import org.thingsboard.server.dao.yunteng.service.TkSysJobService; 33 import org.thingsboard.server.dao.yunteng.service.TkSysJobService;
34 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider; 34 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
  35 +import org.thingsboard.server.queue.util.TbCoreComponent;
35 36
36 /** 调度任务信息操作处理 */ 37 /** 调度任务信息操作处理 */
37 @RestController 38 @RestController
  39 +@TbCoreComponent
38 @RequestMapping("api/yt/monitor/job") 40 @RequestMapping("api/yt/monitor/job")
39 @RequiredArgsConstructor 41 @RequiredArgsConstructor
40 @Api(tags = {"定时任务"}) 42 @Api(tags = {"定时任务"})
@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
16 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 16 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
17 import org.thingsboard.server.controller.BaseController; 17 import org.thingsboard.server.controller.BaseController;
18 import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService; 18 import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService;
  19 +import org.thingsboard.server.queue.util.TbCoreComponent;
19 20
20 import java.sql.Timestamp; 21 import java.sql.Timestamp;
21 import java.util.HashMap; 22 import java.util.HashMap;
@@ -25,6 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -25,6 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
25 26
26 /** 调度日志操作处理 */ 27 /** 调度日志操作处理 */
27 @RestController 28 @RestController
  29 +@TbCoreComponent
28 @RequestMapping("api/yt/monitor/job_log") 30 @RequestMapping("api/yt/monitor/job_log")
29 @RequiredArgsConstructor 31 @RequiredArgsConstructor
30 @Api(tags = {"定时任务执行日志"}) 32 @Api(tags = {"定时任务执行日志"})
@@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
33 import org.thingsboard.server.controller.BaseController; 33 import org.thingsboard.server.controller.BaseController;
34 import org.thingsboard.server.dao.yunteng.service.ThingsModelService; 34 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
35 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService; 35 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
  36 +import org.thingsboard.server.queue.util.TbCoreComponent;
36 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService; 37 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService;
37 import org.thingsboard.server.utils.ImportModbusUtils; 38 import org.thingsboard.server.utils.ImportModbusUtils;
38 39
@@ -48,6 +49,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -48,6 +49,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
48 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE; 49 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
49 50
50 @RestController 51 @RestController
  52 +@TbCoreComponent
51 @RequiredArgsConstructor 53 @RequiredArgsConstructor
52 @RequestMapping("api/yt/things_model") 54 @RequestMapping("api/yt/things_model")
53 @Api(tags = {"物模型管理"}) 55 @Api(tags = {"物模型管理"})
@@ -36,6 +36,7 @@ import org.thingsboard.server.dao.user.UserService; @@ -36,6 +36,7 @@ import org.thingsboard.server.dao.user.UserService;
36 import org.thingsboard.server.dao.yunteng.service.MenuService; 36 import org.thingsboard.server.dao.yunteng.service.MenuService;
37 import org.thingsboard.server.dao.yunteng.service.TkTenantService; 37 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
38 import org.thingsboard.server.dao.yunteng.service.TkUserService; 38 import org.thingsboard.server.dao.yunteng.service.TkUserService;
  39 +import org.thingsboard.server.queue.util.TbCoreComponent;
39 import org.thingsboard.server.service.entitiy.tenant.TbTenantService; 40 import org.thingsboard.server.service.entitiy.tenant.TbTenantService;
40 import org.thingsboard.server.service.entitiy.user.TbUserService; 41 import org.thingsboard.server.service.entitiy.user.TbUserService;
41 import org.thingsboard.server.service.install.InstallScripts; 42 import org.thingsboard.server.service.install.InstallScripts;
@@ -51,6 +52,7 @@ import java.util.UUID; @@ -51,6 +52,7 @@ import java.util.UUID;
51 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 52 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
52 53
53 @RestController 54 @RestController
  55 +@TbCoreComponent
54 @RequestMapping("api/yt/admin") 56 @RequestMapping("api/yt/admin")
55 @Api(tags = {"租户管理", "菜单管理"}) 57 @Api(tags = {"租户管理", "菜单管理"})
56 @RequiredArgsConstructor 58 @RequiredArgsConstructor
@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
21 import org.thingsboard.server.controller.BaseController; 21 import org.thingsboard.server.controller.BaseController;
22 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService; 22 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
23 import org.thingsboard.server.dao.yunteng.service.TkAlarmContactService; 23 import org.thingsboard.server.dao.yunteng.service.TkAlarmContactService;
  24 +import org.thingsboard.server.queue.util.TbCoreComponent;
24 25
25 import java.net.URI; 26 import java.net.URI;
26 import java.util.HashMap; 27 import java.util.HashMap;
@@ -36,6 +37,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -36,6 +37,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
36 * @Description 告警联系人 @Author cxy @Date 2021/11/2 14:54 37 * @Description 告警联系人 @Author cxy @Date 2021/11/2 14:54
37 */ 38 */
38 @RestController 39 @RestController
  40 +@TbCoreComponent
39 @RequestMapping("/api/yt/alarm_contact") 41 @RequestMapping("/api/yt/alarm_contact")
40 @RequiredArgsConstructor 42 @RequiredArgsConstructor
41 @Api(tags = "告警联系人") 43 @Api(tags = "告警联系人")
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
19 import org.thingsboard.server.controller.BaseController; 19 import org.thingsboard.server.controller.BaseController;
20 import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity; 20 import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity;
21 import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService; 21 import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
  22 +import org.thingsboard.server.queue.util.TbCoreComponent;
22 23
23 import java.util.HashMap; 24 import java.util.HashMap;
24 import java.util.List; 25 import java.util.List;
@@ -31,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -31,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
31 * @Description 告警中心 @Author cxy @Date 2021/11/11 9:23 32 * @Description 告警中心 @Author cxy @Date 2021/11/11 9:23
32 */ 33 */
33 @RestController 34 @RestController
  35 +@TbCoreComponent
34 @RequestMapping("/api/yt/alarm") 36 @RequestMapping("/api/yt/alarm")
35 @RequiredArgsConstructor 37 @RequiredArgsConstructor
36 @Api(tags = "告警中心") 38 @Api(tags = "告警中心")
@@ -9,6 +9,7 @@ import org.springframework.util.Assert; @@ -9,6 +9,7 @@ import org.springframework.util.Assert;
9 import org.springframework.web.bind.annotation.*; 9 import org.springframework.web.bind.annotation.*;
10 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO; 10 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
11 import org.thingsboard.server.dao.yunteng.service.TkNoticeService; 11 import org.thingsboard.server.dao.yunteng.service.TkNoticeService;
  12 +import org.thingsboard.server.queue.util.TbCoreComponent;
12 import org.thingsboard.server.service.security.exception.JwtExpiredTokenException; 13 import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
13 14
14 import java.net.InetAddress; 15 import java.net.InetAddress;
@@ -24,6 +25,7 @@ import java.net.InetAddress; @@ -24,6 +25,7 @@ import java.net.InetAddress;
24 * @Copyright 2016-2018 - Powered By 云腾五洲 25 * @Copyright 2016-2018 - Powered By 云腾五洲
25 */ 26 */
26 @RestController 27 @RestController
  28 +@TbCoreComponent
27 @RequestMapping("/api/yt/notice") 29 @RequestMapping("/api/yt/notice")
28 @RequiredArgsConstructor 30 @RequiredArgsConstructor
29 @Slf4j 31 @Slf4j
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO; @@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
12 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 12 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
13 import org.thingsboard.server.controller.BaseController; 13 import org.thingsboard.server.controller.BaseController;
14 import org.thingsboard.server.dao.yunteng.service.SysAppDesignService; 14 import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 16
16 /** 17 /**
17 * @author: 徐浩然 18 * @author: 徐浩然
@@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.SysAppDesignService; @@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
20 */ 21 */
21 @Api(tags = "APP定制") 22 @Api(tags = "APP定制")
22 @RestController 23 @RestController
  24 +@TbCoreComponent
23 @RequestMapping("api/yt/app_design") 25 @RequestMapping("api/yt/app_design")
24 @RequiredArgsConstructor 26 @RequiredArgsConstructor
25 public class TkAppDesignController extends BaseController { 27 public class TkAppDesignController extends BaseController {
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
9 import org.springframework.web.bind.annotation.RestController; 9 import org.springframework.web.bind.annotation.RestController;
10 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO; 10 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
11 import org.thingsboard.server.dao.yunteng.service.SysAreaService; 11 import org.thingsboard.server.dao.yunteng.service.SysAreaService;
  12 +import org.thingsboard.server.queue.util.TbCoreComponent;
12 13
13 import java.util.List; 14 import java.util.List;
14 15
@@ -19,6 +20,7 @@ import java.util.List; @@ -19,6 +20,7 @@ import java.util.List;
19 */ 20 */
20 @Api(tags = "中国省市区街关联") 21 @Api(tags = "中国省市区街关联")
21 @RestController 22 @RestController
  23 +@TbCoreComponent
22 @RequestMapping("api/yt/area") 24 @RequestMapping("api/yt/area")
23 @RequiredArgsConstructor 25 @RequiredArgsConstructor
24 public class TkAreaController { 26 public class TkAreaController {
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum; @@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
23 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 23 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
24 import org.thingsboard.server.controller.BaseController; 24 import org.thingsboard.server.controller.BaseController;
25 import org.thingsboard.server.dao.yunteng.service.TkConfigurationCenterService; 25 import org.thingsboard.server.dao.yunteng.service.TkConfigurationCenterService;
  26 +import org.thingsboard.server.queue.util.TbCoreComponent;
26 27
27 import java.util.HashMap; 28 import java.util.HashMap;
28 import java.util.List; 29 import java.util.List;
@@ -30,6 +31,7 @@ import java.util.List; @@ -30,6 +31,7 @@ import java.util.List;
30 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 31 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
31 32
32 @RestController 33 @RestController
  34 +@TbCoreComponent
33 @RequestMapping("/api/yt/configuration/center") 35 @RequestMapping("/api/yt/configuration/center")
34 @RequiredArgsConstructor 36 @RequiredArgsConstructor
35 @Api(tags = "组态中心") 37 @Api(tags = "组态中心")
@@ -15,8 +15,10 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO; @@ -15,8 +15,10 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
15 import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO; 15 import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
16 import org.thingsboard.server.controller.BaseController; 16 import org.thingsboard.server.controller.BaseController;
17 import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentService; 17 import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentService;
  18 +import org.thingsboard.server.queue.util.TbCoreComponent;
18 19
19 @RestController 20 @RestController
  21 +@TbCoreComponent
20 @RequestMapping("/api/yt/configuration/content") 22 @RequestMapping("/api/yt/configuration/content")
21 @RequiredArgsConstructor 23 @RequiredArgsConstructor
22 @Api(tags = "组态内容") 24 @Api(tags = "组态内容")
@@ -22,11 +22,13 @@ import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService; @@ -22,11 +22,13 @@ import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService;
22 import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentNodeService; 22 import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentNodeService;
23 import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService; 23 import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService;
24 import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService; 24 import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService;
  25 +import org.thingsboard.server.queue.util.TbCoreComponent;
25 26
26 /** 27 /**
27 * @author Administrator 28 * @author Administrator
28 */ 29 */
29 @RestController 30 @RestController
  31 +@TbCoreComponent
30 @RequestMapping("/api/yt/new/configuration/node") 32 @RequestMapping("/api/yt/new/configuration/node")
31 @RequiredArgsConstructor 33 @RequiredArgsConstructor
32 @Api(tags = "组态结点管理(新)") 34 @Api(tags = "组态结点管理(新)")
@@ -15,6 +15,7 @@ import org.thingsboard.server.controller.BaseController; @@ -15,6 +15,7 @@ import org.thingsboard.server.controller.BaseController;
15 import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService; 15 import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService;
16 import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService; 16 import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService;
17 import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService; 17 import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService;
  18 +import org.thingsboard.server.queue.util.TbCoreComponent;
18 19
19 import java.util.List; 20 import java.util.List;
20 import java.util.Optional; 21 import java.util.Optional;
@@ -23,6 +24,7 @@ import java.util.Optional; @@ -23,6 +24,7 @@ import java.util.Optional;
23 * @author Administrator 24 * @author Administrator
24 */ 25 */
25 @RestController 26 @RestController
  27 +@TbCoreComponent
26 @RequestMapping("/api/yt/configuration/node") 28 @RequestMapping("/api/yt/configuration/node")
27 @RequiredArgsConstructor 29 @RequiredArgsConstructor
28 @Api(tags = "组态结点管理") 30 @Api(tags = "组态结点管理")
@@ -40,10 +40,12 @@ import org.thingsboard.server.controller.BaseController; @@ -40,10 +40,12 @@ import org.thingsboard.server.controller.BaseController;
40 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService; 40 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
41 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService; 41 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
42 import org.thingsboard.server.dao.yunteng.service.TkRuleChainService; 42 import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
  43 +import org.thingsboard.server.queue.util.TbCoreComponent;
43 import org.thingsboard.server.service.rule.TbRuleChainService; 44 import org.thingsboard.server.service.rule.TbRuleChainService;
44 import org.thingsboard.server.service.security.permission.Operation; 45 import org.thingsboard.server.service.security.permission.Operation;
45 46
46 @RestController 47 @RestController
  48 +@TbCoreComponent
47 @RequiredArgsConstructor 49 @RequiredArgsConstructor
48 @RequestMapping("api/yt/convert") 50 @RequestMapping("api/yt/convert")
49 @Api(tags = {"数据流转控制器"}) 51 @Api(tags = {"数据流转控制器"})
@@ -23,12 +23,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -23,12 +23,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
23 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 23 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
24 import org.thingsboard.server.controller.BaseController; 24 import org.thingsboard.server.controller.BaseController;
25 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService; 25 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
  26 +import org.thingsboard.server.queue.util.TbCoreComponent;
26 27
27 import java.util.*; 28 import java.util.*;
28 29
29 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 30 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
30 31
31 @RestController 32 @RestController
  33 +@TbCoreComponent
32 @RequiredArgsConstructor 34 @RequiredArgsConstructor
33 @RequestMapping("api/yt/data_board") 35 @RequestMapping("api/yt/data_board")
34 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})") 36 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
@@ -24,11 +24,13 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -24,11 +24,13 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
24 import org.thingsboard.server.controller.BaseController; 24 import org.thingsboard.server.controller.BaseController;
25 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService; 25 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
26 import org.thingsboard.server.dao.yunteng.service.TkDataComponentService; 26 import org.thingsboard.server.dao.yunteng.service.TkDataComponentService;
  27 +import org.thingsboard.server.queue.util.TbCoreComponent;
27 28
28 import java.util.ArrayList; 29 import java.util.ArrayList;
29 import java.util.List; 30 import java.util.List;
30 31
31 @RestController 32 @RestController
  33 +@TbCoreComponent
32 @RequiredArgsConstructor 34 @RequiredArgsConstructor
33 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})") 35 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
34 @RequestMapping("api/yt/data_component") 36 @RequestMapping("api/yt/data_component")
@@ -15,11 +15,13 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO; @@ -15,11 +15,13 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
15 import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO; 15 import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
16 import org.thingsboard.server.controller.BaseController; 16 import org.thingsboard.server.controller.BaseController;
17 import org.thingsboard.server.dao.yunteng.service.TkDataViewContentService; 17 import org.thingsboard.server.dao.yunteng.service.TkDataViewContentService;
  18 +import org.thingsboard.server.queue.util.TbCoreComponent;
18 19
19 /** 20 /**
20 * @author tianfuLei 21 * @author tianfuLei
21 */ 22 */
22 @RestController 23 @RestController
  24 +@TbCoreComponent
23 @RequestMapping("/api/yt/data_view/content") 25 @RequestMapping("/api/yt/data_view/content")
24 @RequiredArgsConstructor 26 @RequiredArgsConstructor
25 @Api(tags = "大屏内容") 27 @Api(tags = "大屏内容")
@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum; @@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
21 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 21 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
22 import org.thingsboard.server.controller.BaseController; 22 import org.thingsboard.server.controller.BaseController;
23 import org.thingsboard.server.dao.yunteng.service.TkDataViewService; 23 import org.thingsboard.server.dao.yunteng.service.TkDataViewService;
  24 +import org.thingsboard.server.queue.util.TbCoreComponent;
24 25
25 import java.util.HashMap; 26 import java.util.HashMap;
26 27
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
30 * @author tianfuLei 31 * @author tianfuLei
31 */ 32 */
32 @RestController 33 @RestController
  34 +@TbCoreComponent
33 @RequestMapping("/api/yt/data_view") 35 @RequestMapping("/api/yt/data_view")
34 @RequiredArgsConstructor 36 @RequiredArgsConstructor
35 @Api(tags = "大屏设计器") 37 @Api(tags = "大屏设计器")
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TkSystemTypeEnum; @@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TkSystemTypeEnum;
18 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 18 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
19 import org.thingsboard.server.controller.BaseController; 19 import org.thingsboard.server.controller.BaseController;
20 import org.thingsboard.server.dao.yunteng.service.TkDataViewInterfaceService; 20 import org.thingsboard.server.dao.yunteng.service.TkDataViewInterfaceService;
  21 +import org.thingsboard.server.queue.util.TbCoreComponent;
21 22
22 import java.util.*; 23 import java.util.*;
23 24
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
27 * @author tianfuLei 28 * @author tianfuLei
28 */ 29 */
29 @RestController 30 @RestController
  31 +@TbCoreComponent
30 @RequestMapping("/api/yt/data_view_interface") 32 @RequestMapping("/api/yt/data_view_interface")
31 @RequiredArgsConstructor 33 @RequiredArgsConstructor
32 @Api(tags = "大屏公共接口") 34 @Api(tags = "大屏公共接口")
@@ -19,12 +19,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -19,12 +19,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
19 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 19 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
20 import org.thingsboard.server.controller.BaseController; 20 import org.thingsboard.server.controller.BaseController;
21 import org.thingsboard.server.dao.yunteng.service.TkDeviceAccessInformationService; 21 import org.thingsboard.server.dao.yunteng.service.TkDeviceAccessInformationService;
  22 +import org.thingsboard.server.queue.util.TbCoreComponent;
22 23
23 import java.util.HashMap; 24 import java.util.HashMap;
24 25
25 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 26 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
26 27
27 @RestController 28 @RestController
  29 +@TbCoreComponent
28 @RequiredArgsConstructor 30 @RequiredArgsConstructor
29 @RequestMapping("api/yt/device_profile/access_information") 31 @RequestMapping("api/yt/device_profile/access_information")
30 @Api(tags = {"设备接入信息管理"}) 32 @Api(tags = {"设备接入信息管理"})
@@ -40,6 +40,7 @@ import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService; @@ -40,6 +40,7 @@ import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
40 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService; 40 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
41 import org.thingsboard.server.dao.yunteng.service.TkDeviceService; 41 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
42 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService; 42 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
  43 +import org.thingsboard.server.queue.util.TbCoreComponent;
43 import org.thingsboard.server.service.entitiy.alarm.TbAlarmService; 44 import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
44 import org.thingsboard.server.service.entitiy.device.TbDeviceService; 45 import org.thingsboard.server.service.entitiy.device.TbDeviceService;
45 import org.thingsboard.server.service.entitiy.entity.relation.TbEntityRelationService; 46 import org.thingsboard.server.service.entitiy.entity.relation.TbEntityRelationService;
@@ -55,6 +56,7 @@ import java.util.concurrent.ExecutionException; @@ -55,6 +56,7 @@ import java.util.concurrent.ExecutionException;
55 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 56 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
56 57
57 @RestController 58 @RestController
  59 +@TbCoreComponent
58 @RequiredArgsConstructor 60 @RequiredArgsConstructor
59 @RequestMapping("api/yt/device") 61 @RequestMapping("api/yt/device")
60 @Api(tags = {"设备管理"}) 62 @Api(tags = {"设备管理"})
@@ -15,12 +15,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -15,12 +15,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
15 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 15 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
16 import org.thingsboard.server.controller.BaseController; 16 import org.thingsboard.server.controller.BaseController;
17 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileCategoryService; 17 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileCategoryService;
  18 +import org.thingsboard.server.queue.util.TbCoreComponent;
18 19
19 import java.util.HashMap; 20 import java.util.HashMap;
20 21
21 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 22 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
22 23
23 @RestController 24 @RestController
  25 +@TbCoreComponent
24 @RequiredArgsConstructor 26 @RequiredArgsConstructor
25 @RequestMapping("api/yt/device_profile/category") 27 @RequestMapping("api/yt/device_profile/category")
26 @Api(tags = {"产品品类管理"}) 28 @Api(tags = {"产品品类管理"})
@@ -34,6 +34,7 @@ import org.thingsboard.server.controller.BaseController; @@ -34,6 +34,7 @@ import org.thingsboard.server.controller.BaseController;
34 import org.thingsboard.server.dao.yunteng.service.ThingsModelService; 34 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
35 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService; 35 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
36 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService; 36 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
  37 +import org.thingsboard.server.queue.util.TbCoreComponent;
37 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService; 38 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService;
38 import org.thingsboard.server.service.security.permission.Operation; 39 import org.thingsboard.server.service.security.permission.Operation;
39 40
@@ -45,6 +46,7 @@ import java.util.concurrent.ExecutionException; @@ -45,6 +46,7 @@ import java.util.concurrent.ExecutionException;
45 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 46 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
46 47
47 @RestController 48 @RestController
  49 +@TbCoreComponent
48 @RequiredArgsConstructor 50 @RequiredArgsConstructor
49 @RequestMapping("api/yt/device_profile") 51 @RequestMapping("api/yt/device_profile")
50 @Api(tags = {"设备配置管理"}) 52 @Api(tags = {"设备配置管理"})
@@ -30,6 +30,8 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum; @@ -30,6 +30,8 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
30 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 30 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
31 import org.thingsboard.server.controller.BaseController; 31 import org.thingsboard.server.controller.BaseController;
32 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService; 32 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
  33 +import org.thingsboard.server.queue.util.TbCoreComponent;
  34 +
33 import java.util.HashMap; 35 import java.util.HashMap;
34 import java.util.List; 36 import java.util.List;
35 import java.util.Map; 37 import java.util.Map;
@@ -38,6 +40,7 @@ import java.util.UUID; @@ -38,6 +40,7 @@ import java.util.UUID;
38 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 40 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
39 41
40 @RestController 42 @RestController
  43 +@TbCoreComponent
41 @RequiredArgsConstructor 44 @RequiredArgsConstructor
42 @RequestMapping("api/yt/js") 45 @RequestMapping("api/yt/js")
43 @Api(tags = {"设备数据解析脚本管理"}) 46 @Api(tags = {"设备数据解析脚本管理"})
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum; @@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
18 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 18 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
19 import org.thingsboard.server.controller.BaseController; 19 import org.thingsboard.server.controller.BaseController;
20 import org.thingsboard.server.dao.yunteng.service.TkDeviceStateLogService; 20 import org.thingsboard.server.dao.yunteng.service.TkDeviceStateLogService;
  21 +import org.thingsboard.server.queue.util.TbCoreComponent;
21 22
22 import java.sql.Timestamp; 23 import java.sql.Timestamp;
23 import java.util.HashMap; 24 import java.util.HashMap;
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
27 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE; 28 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
28 29
29 @RestController 30 @RestController
  31 +@TbCoreComponent
30 @RequiredArgsConstructor 32 @RequiredArgsConstructor
31 @RequestMapping("api/yt/device/state/log") 33 @RequestMapping("api/yt/device/state/log")
32 @Api(tags = {"设备上下线记录"}) 34 @Api(tags = {"设备上下线记录"})
@@ -17,10 +17,12 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceTypeDTO; @@ -17,10 +17,12 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceTypeDTO;
17 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 17 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
18 import org.thingsboard.server.controller.BaseController; 18 import org.thingsboard.server.controller.BaseController;
19 import org.thingsboard.server.dao.yunteng.service.TkDeviceTypeService; 19 import org.thingsboard.server.dao.yunteng.service.TkDeviceTypeService;
  20 +import org.thingsboard.server.queue.util.TbCoreComponent;
20 21
21 import java.util.List; 22 import java.util.List;
22 23
23 @RestController 24 @RestController
  25 +@TbCoreComponent
24 @RequestMapping("api/yt/device_type") 26 @RequestMapping("api/yt/device_type")
25 @RequiredArgsConstructor 27 @RequiredArgsConstructor
26 @Api(value = "设备类型") 28 @Api(value = "设备类型")
@@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
16 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 16 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
17 import org.thingsboard.server.controller.BaseController; 17 import org.thingsboard.server.controller.BaseController;
18 import org.thingsboard.server.dao.yunteng.service.SysDictService; 18 import org.thingsboard.server.dao.yunteng.service.SysDictService;
  19 +import org.thingsboard.server.queue.util.TbCoreComponent;
19 20
20 import java.util.HashMap; 21 import java.util.HashMap;
21 22
22 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 23 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
23 24
24 @RestController 25 @RestController
  26 +@TbCoreComponent
25 @RequestMapping("api/yt/dict") 27 @RequestMapping("api/yt/dict")
26 @RequiredArgsConstructor 28 @RequiredArgsConstructor
27 @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})") 29 @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
17 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 17 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
18 import org.thingsboard.server.controller.BaseController; 18 import org.thingsboard.server.controller.BaseController;
19 import org.thingsboard.server.dao.yunteng.service.SysDictItemService; 19 import org.thingsboard.server.dao.yunteng.service.SysDictItemService;
  20 +import org.thingsboard.server.queue.util.TbCoreComponent;
20 21
21 import java.util.HashMap; 22 import java.util.HashMap;
22 import java.util.List; 23 import java.util.List;
@@ -25,6 +26,7 @@ import java.util.Map; @@ -25,6 +26,7 @@ import java.util.Map;
25 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 26 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
26 27
27 @RestController 28 @RestController
  29 +@TbCoreComponent
28 @RequestMapping("api/yt/dict_item") 30 @RequestMapping("api/yt/dict_item")
29 @RequiredArgsConstructor 31 @RequiredArgsConstructor
30 public class TkDictItemController extends BaseController { 32 public class TkDictItemController extends BaseController {
@@ -10,6 +10,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException; @@ -10,6 +10,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
10 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO; 10 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
11 import org.thingsboard.server.controller.BaseController; 11 import org.thingsboard.server.controller.BaseController;
12 import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService; 12 import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
  13 +import org.thingsboard.server.queue.util.TbCoreComponent;
13 14
14 /** 15 /**
15 * @author: 徐浩然 16 * @author: 徐浩然
@@ -18,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService; @@ -18,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
18 */ 19 */
19 @Api(tags = "企业信息") 20 @Api(tags = "企业信息")
20 @RestController 21 @RestController
  22 +@TbCoreComponent
21 @RequestMapping("api/yt/enterprise") 23 @RequestMapping("api/yt/enterprise")
22 @RequiredArgsConstructor 24 @RequiredArgsConstructor
23 public class TkEnterpriseController extends BaseController { 25 public class TkEnterpriseController extends BaseController {
@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum; @@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
16 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum; 16 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
17 import org.thingsboard.server.controller.BaseController; 17 import org.thingsboard.server.controller.BaseController;
18 import org.thingsboard.server.dao.yunteng.event.TkEventsService; 18 import org.thingsboard.server.dao.yunteng.event.TkEventsService;
  19 +import org.thingsboard.server.queue.util.TbCoreComponent;
19 20
20 import java.util.UUID; 21 import java.util.UUID;
21 22
@@ -25,6 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -25,6 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
25 * @author Administrator 26 * @author Administrator
26 */ 27 */
27 @RestController 28 @RestController
  29 +@TbCoreComponent
28 @RequestMapping("api/yt/event") 30 @RequestMapping("api/yt/event")
29 @Api(tags = {"设备事件"}) 31 @Api(tags = {"设备事件"})
30 @RequiredArgsConstructor 32 @RequiredArgsConstructor
@@ -8,8 +8,10 @@ import org.springframework.web.bind.annotation.*; @@ -8,8 +8,10 @@ import org.springframework.web.bind.annotation.*;
8 import org.thingsboard.server.common.data.exception.ThingsboardException; 8 import org.thingsboard.server.common.data.exception.ThingsboardException;
9 import org.thingsboard.server.common.data.yunteng.dto.FrpInfoDTO; 9 import org.thingsboard.server.common.data.yunteng.dto.FrpInfoDTO;
10 import org.thingsboard.server.dao.yunteng.service.TkFrpInfoService; 10 import org.thingsboard.server.dao.yunteng.service.TkFrpInfoService;
  11 +import org.thingsboard.server.queue.util.TbCoreComponent;
11 12
12 @RestController 13 @RestController
  14 +@TbCoreComponent
13 @RequestMapping("api/yt/frp") 15 @RequestMapping("api/yt/frp")
14 @Api(tags = "Frp内网穿透信息") 16 @Api(tags = "Frp内网穿透信息")
15 @RequiredArgsConstructor 17 @RequiredArgsConstructor
@@ -11,12 +11,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -11,12 +11,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
11 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 11 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
12 import org.thingsboard.server.controller.BaseController; 12 import org.thingsboard.server.controller.BaseController;
13 import org.thingsboard.server.dao.yunteng.service.TkMailLogService; 13 import org.thingsboard.server.dao.yunteng.service.TkMailLogService;
  14 +import org.thingsboard.server.queue.util.TbCoreComponent;
14 15
15 import java.util.HashMap; 16 import java.util.HashMap;
16 17
17 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 18 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
18 19
19 @RestController 20 @RestController
  21 +@TbCoreComponent
20 @RequestMapping("api/yt/mail_log") 22 @RequestMapping("api/yt/mail_log")
21 @RequiredArgsConstructor 23 @RequiredArgsConstructor
22 public class TkMailLogController extends BaseController { 24 public class TkMailLogController extends BaseController {
@@ -10,8 +10,10 @@ import org.thingsboard.server.common.data.yunteng.dto.TkMapGeoJsonDTO; @@ -10,8 +10,10 @@ import org.thingsboard.server.common.data.yunteng.dto.TkMapGeoJsonDTO;
10 import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum; 10 import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
11 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 11 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
12 import org.thingsboard.server.dao.yunteng.service.TkMapGeoJsonService; 12 import org.thingsboard.server.dao.yunteng.service.TkMapGeoJsonService;
  13 +import org.thingsboard.server.queue.util.TbCoreComponent;
13 14
14 @RestController 15 @RestController
  16 +@TbCoreComponent
15 @RequestMapping("/api/yt/map/geo_json") 17 @RequestMapping("/api/yt/map/geo_json")
16 @RequiredArgsConstructor 18 @RequiredArgsConstructor
17 @Api(tags = "行政区域经纬度信息") 19 @Api(tags = "行政区域经纬度信息")
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio @@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
12 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO; 12 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
13 import org.thingsboard.server.controller.BaseController; 13 import org.thingsboard.server.controller.BaseController;
14 import org.thingsboard.server.dao.yunteng.service.MenuService; 14 import org.thingsboard.server.dao.yunteng.service.MenuService;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 16
16 import java.net.URI; 17 import java.net.URI;
17 import java.util.List; 18 import java.util.List;
@@ -19,6 +20,7 @@ import java.util.Optional; @@ -19,6 +20,7 @@ import java.util.Optional;
19 import java.util.Set; 20 import java.util.Set;
20 21
21 @RestController 22 @RestController
  23 +@TbCoreComponent
22 @RequiredArgsConstructor 24 @RequiredArgsConstructor
23 @RequestMapping("api/yt/menu") 25 @RequestMapping("api/yt/menu")
24 public class TkMenuController extends BaseController { 26 public class TkMenuController extends BaseController {
@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
17 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 17 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
18 import org.thingsboard.server.controller.BaseController; 18 import org.thingsboard.server.controller.BaseController;
19 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService; 19 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
  20 +import org.thingsboard.server.queue.util.TbCoreComponent;
20 21
21 import java.util.HashMap; 22 import java.util.HashMap;
22 import java.util.List; 23 import java.util.List;
@@ -24,6 +25,7 @@ import java.util.List; @@ -24,6 +25,7 @@ import java.util.List;
24 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 25 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
25 26
26 @RestController 27 @RestController
  28 +@TbCoreComponent
27 @RequestMapping("api/yt/message") 29 @RequestMapping("api/yt/message")
28 @RequiredArgsConstructor 30 @RequiredArgsConstructor
29 public class TkMessageConfigController extends BaseController { 31 public class TkMessageConfigController extends BaseController {
@@ -14,12 +14,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -14,12 +14,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
14 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 14 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
15 import org.thingsboard.server.controller.BaseController; 15 import org.thingsboard.server.controller.BaseController;
16 import org.thingsboard.server.dao.yunteng.service.TkMessageLogService; 16 import org.thingsboard.server.dao.yunteng.service.TkMessageLogService;
  17 +import org.thingsboard.server.queue.util.TbCoreComponent;
17 18
18 import java.util.HashMap; 19 import java.util.HashMap;
19 20
20 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 21 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
21 22
22 @RestController 23 @RestController
  24 +@TbCoreComponent
23 @RequestMapping("api/yt/message_log") 25 @RequestMapping("api/yt/message_log")
24 @RequiredArgsConstructor 26 @RequiredArgsConstructor
25 public class TkMessageLogController extends BaseController { 27 public class TkMessageLogController extends BaseController {
@@ -25,12 +25,14 @@ import org.thingsboard.server.controller.BaseController; @@ -25,12 +25,14 @@ import org.thingsboard.server.controller.BaseController;
25 import org.thingsboard.server.dao.yunteng.service.TkMailService; 25 import org.thingsboard.server.dao.yunteng.service.TkMailService;
26 import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService; 26 import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
27 import org.thingsboard.server.dao.yunteng.service.TkMessageService; 27 import org.thingsboard.server.dao.yunteng.service.TkMessageService;
  28 +import org.thingsboard.server.queue.util.TbCoreComponent;
28 29
29 import java.util.HashMap; 30 import java.util.HashMap;
30 31
31 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 32 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
32 33
33 @RestController 34 @RestController
  35 +@TbCoreComponent
34 @RequestMapping("api/yt/template") 36 @RequestMapping("api/yt/template")
35 @RequiredArgsConstructor 37 @RequiredArgsConstructor
36 public class TkMessageTemplateController extends BaseController { 38 public class TkMessageTemplateController extends BaseController {
@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ViewType; @@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ViewType;
21 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil; 21 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
22 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 22 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
23 import org.thingsboard.server.dao.yunteng.service.*; 23 import org.thingsboard.server.dao.yunteng.service.*;
  24 +import org.thingsboard.server.queue.util.TbCoreComponent;
24 25
25 import java.net.UnknownHostException; 26 import java.net.UnknownHostException;
26 import java.util.List; 27 import java.util.List;
@@ -29,6 +30,7 @@ import java.util.Optional; @@ -29,6 +30,7 @@ import java.util.Optional;
29 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN; 30 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN;
30 31
31 @RestController 32 @RestController
  33 +@TbCoreComponent
32 @RequestMapping("api/yt/noauth") 34 @RequestMapping("api/yt/noauth")
33 @RequiredArgsConstructor 35 @RequiredArgsConstructor
34 public class TkNoAuthController { 36 public class TkNoAuthController {
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum; @@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
18 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 18 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
19 import org.thingsboard.server.controller.BaseController; 19 import org.thingsboard.server.controller.BaseController;
20 import org.thingsboard.server.dao.yunteng.service.SysNoticeService; 20 import org.thingsboard.server.dao.yunteng.service.SysNoticeService;
  21 +import org.thingsboard.server.queue.util.TbCoreComponent;
21 22
22 import java.util.HashMap; 23 import java.util.HashMap;
23 import java.util.Map; 24 import java.util.Map;
@@ -31,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -31,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
31 */ 32 */
32 @Api(tags = "通知管理") 33 @Api(tags = "通知管理")
33 @RestController 34 @RestController
  35 +@TbCoreComponent
34 @RequestMapping("api/yt/notice") 36 @RequestMapping("api/yt/notice")
35 @RequiredArgsConstructor 37 @RequiredArgsConstructor
36 public class TkNoticeController extends BaseController { 38 public class TkNoticeController extends BaseController {
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum; @@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
12 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 12 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
13 import org.thingsboard.server.controller.BaseController; 13 import org.thingsboard.server.controller.BaseController;
14 import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService; 14 import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 16
16 import java.util.HashMap; 17 import java.util.HashMap;
17 import java.util.Map; 18 import java.util.Map;
@@ -24,6 +25,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -24,6 +25,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
24 */ 25 */
25 @Api(tags = "我的通知") 26 @Api(tags = "我的通知")
26 @RestController 27 @RestController
  28 +@TbCoreComponent
27 @RequestMapping("api/yt/notice_user") 29 @RequestMapping("api/yt/notice_user")
28 @RequiredArgsConstructor 30 @RequiredArgsConstructor
29 public class TkNoticeUserController extends BaseController { 31 public class TkNoticeUserController extends BaseController {
@@ -16,10 +16,12 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -16,10 +16,12 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
16 import org.thingsboard.server.controller.BaseController; 16 import org.thingsboard.server.controller.BaseController;
17 import org.thingsboard.server.dao.yunteng.entities.TkOpinionEntity; 17 import org.thingsboard.server.dao.yunteng.entities.TkOpinionEntity;
18 import org.thingsboard.server.dao.yunteng.service.TkOpinionService; 18 import org.thingsboard.server.dao.yunteng.service.TkOpinionService;
  19 +import org.thingsboard.server.queue.util.TbCoreComponent;
19 20
20 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 21 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
21 22
22 @RestController 23 @RestController
  24 +@TbCoreComponent
23 @RequestMapping("api/yt/opinion") 25 @RequestMapping("api/yt/opinion")
24 @Api(tags = {"意见反馈"}) 26 @Api(tags = {"意见反馈"})
25 @RequiredArgsConstructor 27 @RequiredArgsConstructor
@@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO; @@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
16 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO; 16 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
17 import org.thingsboard.server.controller.BaseController; 17 import org.thingsboard.server.controller.BaseController;
18 import org.thingsboard.server.dao.yunteng.service.TkOrganizationService; 18 import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
  19 +import org.thingsboard.server.queue.util.TbCoreComponent;
19 20
20 import java.net.URI; 21 import java.net.URI;
21 import java.util.List; 22 import java.util.List;
22 import java.util.Optional; 23 import java.util.Optional;
23 24
24 @RestController 25 @RestController
  26 +@TbCoreComponent
25 @RequestMapping("api/yt/organization") 27 @RequestMapping("api/yt/organization")
26 @Api(tags = "组织管理") 28 @Api(tags = "组织管理")
27 @RequiredArgsConstructor 29 @RequiredArgsConstructor
@@ -8,11 +8,13 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio @@ -8,11 +8,13 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
8 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage; 8 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
9 import org.thingsboard.server.common.data.yunteng.core.utils.FileStorageService; 9 import org.thingsboard.server.common.data.yunteng.core.utils.FileStorageService;
10 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse; 10 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
  11 +import org.thingsboard.server.queue.util.TbCoreComponent;
11 12
12 import javax.servlet.http.HttpServletRequest; 13 import javax.servlet.http.HttpServletRequest;
13 import javax.servlet.http.HttpServletResponse; 14 import javax.servlet.http.HttpServletResponse;
14 15
15 @RestController 16 @RestController
  17 +@TbCoreComponent
16 @RequestMapping("api/yt/oss") 18 @RequestMapping("api/yt/oss")
17 public class TkOssFileController { 19 public class TkOssFileController {
18 20
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO; @@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
12 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 12 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
13 import org.thingsboard.server.controller.BaseController; 13 import org.thingsboard.server.controller.BaseController;
14 import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService; 14 import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 16
16 /** 17 /**
17 * @author: 徐浩然 18 * @author: 徐浩然
@@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService; @@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
20 */ 21 */
21 @Api(tags = "平台定制") 22 @Api(tags = "平台定制")
22 @RestController 23 @RestController
  24 +@TbCoreComponent
23 @RequestMapping("api/yt/platform") 25 @RequestMapping("api/yt/platform")
24 @RequiredArgsConstructor 26 @RequiredArgsConstructor
25 public class TkPlatformDesignController extends BaseController { 27 public class TkPlatformDesignController extends BaseController {
@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
22 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 22 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
23 import org.thingsboard.server.controller.BaseController; 23 import org.thingsboard.server.controller.BaseController;
24 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService; 24 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
  25 +import org.thingsboard.server.queue.util.TbCoreComponent;
25 26
26 import java.sql.Timestamp; 27 import java.sql.Timestamp;
27 import java.util.HashMap; 28 import java.util.HashMap;
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
30 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE; 31 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
31 32
32 @RestController 33 @RestController
  34 +@TbCoreComponent
33 @RequestMapping("api/yt/report_form/config") 35 @RequestMapping("api/yt/report_form/config")
34 @Api(tags = "报表配置信息") 36 @Api(tags = "报表配置信息")
35 @RequiredArgsConstructor 37 @RequiredArgsConstructor
@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
24 import org.thingsboard.server.controller.BaseController; 24 import org.thingsboard.server.controller.BaseController;
25 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService; 25 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
26 import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService; 26 import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
  27 +import org.thingsboard.server.queue.util.TbCoreComponent;
27 28
28 import java.sql.Timestamp; 29 import java.sql.Timestamp;
29 import java.util.ArrayList; 30 import java.util.ArrayList;
@@ -34,6 +35,7 @@ import java.util.Map; @@ -34,6 +35,7 @@ import java.util.Map;
34 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 35 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
35 36
36 @RestController 37 @RestController
  38 +@TbCoreComponent
37 @RequestMapping("api/yt/report/generate/record") 39 @RequestMapping("api/yt/report/generate/record")
38 @Api(tags = "报表生成记录") 40 @Api(tags = "报表生成记录")
39 @RequiredArgsConstructor 41 @RequiredArgsConstructor
@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.RoleEnum; @@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
14 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 14 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
15 import org.thingsboard.server.controller.BaseController; 15 import org.thingsboard.server.controller.BaseController;
16 import org.thingsboard.server.dao.yunteng.service.RoleService; 16 import org.thingsboard.server.dao.yunteng.service.RoleService;
  17 +import org.thingsboard.server.queue.util.TbCoreComponent;
17 18
18 import java.util.HashMap; 19 import java.util.HashMap;
19 import java.util.List; 20 import java.util.List;
@@ -22,6 +23,7 @@ import java.util.Set; @@ -22,6 +23,7 @@ import java.util.Set;
22 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 23 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
23 24
24 @RestController 25 @RestController
  26 +@TbCoreComponent
25 @RequestMapping("api/yt/role") 27 @RequestMapping("api/yt/role")
26 @RequiredArgsConstructor 28 @RequiredArgsConstructor
27 public class TkRoleController extends BaseController { 29 public class TkRoleController extends BaseController {
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
18 import org.thingsboard.server.controller.BaseController; 18 import org.thingsboard.server.controller.BaseController;
19 import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity; 19 import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity;
20 import org.thingsboard.server.dao.yunteng.service.TkRpcRecordService; 20 import org.thingsboard.server.dao.yunteng.service.TkRpcRecordService;
  21 +import org.thingsboard.server.queue.util.TbCoreComponent;
21 22
22 import java.sql.Timestamp; 23 import java.sql.Timestamp;
23 24
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
27 * @author Administrator 28 * @author Administrator
28 */ 29 */
29 @RestController 30 @RestController
  31 +@TbCoreComponent
30 @RequestMapping("api/yt/rpc") 32 @RequestMapping("api/yt/rpc")
31 @Api(tags = {"命令下发记录"}) 33 @Api(tags = {"命令下发记录"})
32 @RequiredArgsConstructor 34 @RequiredArgsConstructor
@@ -8,11 +8,13 @@ import org.springframework.web.bind.annotation.RequestParam; @@ -8,11 +8,13 @@ import org.springframework.web.bind.annotation.RequestParam;
8 import org.springframework.web.bind.annotation.RestController; 8 import org.springframework.web.bind.annotation.RestController;
9 import org.thingsboard.server.common.data.StringUtils; 9 import org.thingsboard.server.common.data.StringUtils;
10 import org.thingsboard.server.dao.yunteng.service.rtsp.TkFLVService; 10 import org.thingsboard.server.dao.yunteng.service.rtsp.TkFLVService;
  11 +import org.thingsboard.server.queue.util.TbCoreComponent;
11 12
12 import javax.servlet.http.HttpServletRequest; 13 import javax.servlet.http.HttpServletRequest;
13 import javax.servlet.http.HttpServletResponse; 14 import javax.servlet.http.HttpServletResponse;
14 15
15 @RestController 16 @RestController
  17 +@TbCoreComponent
16 @RequestMapping("api/yt/rtsp") 18 @RequestMapping("api/yt/rtsp")
17 @Api(tags = {"rtsp流转换"}) 19 @Api(tags = {"rtsp流转换"})
18 @RequiredArgsConstructor 20 @RequiredArgsConstructor
@@ -12,8 +12,10 @@ import org.thingsboard.server.common.data.id.TenantId; @@ -12,8 +12,10 @@ import org.thingsboard.server.common.data.id.TenantId;
12 import org.thingsboard.server.common.data.rule.RuleChainType; 12 import org.thingsboard.server.common.data.rule.RuleChainType;
13 import org.thingsboard.server.controller.BaseController; 13 import org.thingsboard.server.controller.BaseController;
14 import org.thingsboard.server.dao.yunteng.service.TkRuleChainService; 14 import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 16
16 @RestController 17 @RestController
  18 +@TbCoreComponent
17 @RequiredArgsConstructor 19 @RequiredArgsConstructor
18 @RequestMapping("api/yt/rule_chain") 20 @RequestMapping("api/yt/rule_chain")
19 @Api(tags = {"规则链管理"}) 21 @Api(tags = {"规则链管理"})
@@ -26,6 +26,7 @@ import org.thingsboard.server.controller.BaseController; @@ -26,6 +26,7 @@ import org.thingsboard.server.controller.BaseController;
26 import org.thingsboard.server.controller.yunteng.aspect.annotation.AutoLog; 26 import org.thingsboard.server.controller.yunteng.aspect.annotation.AutoLog;
27 import org.thingsboard.server.dao.model.ModelConstants; 27 import org.thingsboard.server.dao.model.ModelConstants;
28 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService; 28 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
  29 +import org.thingsboard.server.queue.util.TbCoreComponent;
29 30
30 import java.net.URI; 31 import java.net.URI;
31 import java.util.*; 32 import java.util.*;
@@ -35,6 +36,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -35,6 +36,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
35 36
36 /** @Description 场景联动 @Author cxy @Date 2021/11/25 11:25 */ 37 /** @Description 场景联动 @Author cxy @Date 2021/11/25 11:25 */
37 @RestController 38 @RestController
  39 +@TbCoreComponent
38 @RequestMapping("/api/yt/scene_linkage") 40 @RequestMapping("/api/yt/scene_linkage")
39 @RequiredArgsConstructor 41 @RequiredArgsConstructor
40 @Api(tags = "场景联动") 42 @Api(tags = "场景联动")
@@ -12,8 +12,10 @@ import org.thingsboard.server.common.data.yunteng.enums.ShareViewType; @@ -12,8 +12,10 @@ import org.thingsboard.server.common.data.yunteng.enums.ShareViewType;
12 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 12 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
13 import org.thingsboard.server.controller.BaseController; 13 import org.thingsboard.server.controller.BaseController;
14 import org.thingsboard.server.dao.yunteng.service.TkShareViewService; 14 import org.thingsboard.server.dao.yunteng.service.TkShareViewService;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 16
16 @RestController 17 @RestController
  18 +@TbCoreComponent
17 @RequiredArgsConstructor 19 @RequiredArgsConstructor
18 @RequestMapping("api/yt/share") 20 @RequestMapping("api/yt/share")
19 @Api(tags = {"分享的视图"}) 21 @Api(tags = {"分享的视图"})
@@ -17,10 +17,12 @@ import org.thingsboard.server.controller.BaseController; @@ -17,10 +17,12 @@ import org.thingsboard.server.controller.BaseController;
17 import org.thingsboard.server.dao.model.ModelConstants; 17 import org.thingsboard.server.dao.model.ModelConstants;
18 import org.thingsboard.server.dao.yunteng.entities.SysLogEntity; 18 import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
19 import org.thingsboard.server.dao.yunteng.service.TkSysLogService; 19 import org.thingsboard.server.dao.yunteng.service.TkSysLogService;
  20 +import org.thingsboard.server.queue.util.TbCoreComponent;
20 21
21 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 22 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
22 23
23 @RestController 24 @RestController
  25 +@TbCoreComponent
24 @RequestMapping("api/yt/log") 26 @RequestMapping("api/yt/log")
25 @Api(tags = {"日志管理"}) 27 @Api(tags = {"日志管理"})
26 @RequiredArgsConstructor 28 @RequiredArgsConstructor
@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
22 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 22 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
23 import org.thingsboard.server.controller.BaseController; 23 import org.thingsboard.server.controller.BaseController;
24 import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService; 24 import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
  25 +import org.thingsboard.server.queue.util.TbCoreComponent;
25 26
26 import java.util.HashMap; 27 import java.util.HashMap;
27 28
@@ -29,6 +30,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -29,6 +30,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
29 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE; 30 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
30 31
31 @RestController 32 @RestController
  33 +@TbCoreComponent
32 @RequestMapping("api/yt/task_center") 34 @RequestMapping("api/yt/task_center")
33 @Api(tags = {"任务中心"}) 35 @Api(tags = {"任务中心"})
34 @RequiredArgsConstructor 36 @RequiredArgsConstructor
@@ -15,12 +15,14 @@ import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordE @@ -15,12 +15,14 @@ import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordE
15 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum; 15 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
16 import org.thingsboard.server.dao.user.UserService; 16 import org.thingsboard.server.dao.user.UserService;
17 import org.thingsboard.server.dao.yunteng.service.TkUserService; 17 import org.thingsboard.server.dao.yunteng.service.TkUserService;
  18 +import org.thingsboard.server.queue.util.TbCoreComponent;
18 import org.thingsboard.server.service.security.model.SecurityUser; 19 import org.thingsboard.server.service.security.model.SecurityUser;
19 import org.thingsboard.server.service.security.system.SystemSecurityService; 20 import org.thingsboard.server.service.security.system.SystemSecurityService;
20 21
21 import java.util.UUID; 22 import java.util.UUID;
22 23
23 @RestController 24 @RestController
  25 +@TbCoreComponent
24 @RequestMapping("/api/yt/tenant") 26 @RequestMapping("/api/yt/tenant")
25 public class TkTenantController extends AbstractUserAccount { 27 public class TkTenantController extends AbstractUserAccount {
26 28
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
18 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 18 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
19 import org.thingsboard.server.controller.BaseController; 19 import org.thingsboard.server.controller.BaseController;
20 import org.thingsboard.server.dao.yunteng.service.TkTenantService; 20 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
  21 +import org.thingsboard.server.queue.util.TbCoreComponent;
21 22
22 import java.util.List; 23 import java.util.List;
23 import java.util.UUID; 24 import java.util.UUID;
@@ -25,6 +26,7 @@ import java.util.UUID; @@ -25,6 +26,7 @@ import java.util.UUID;
25 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 26 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
26 27
27 @RestController 28 @RestController
  29 +@TbCoreComponent
28 @RequestMapping("/api/yt/tenant_profiles") 30 @RequestMapping("/api/yt/tenant_profiles")
29 @RequiredArgsConstructor 31 @RequiredArgsConstructor
30 public class TkTenantProfilesController extends BaseController { 32 public class TkTenantProfilesController extends BaseController {
@@ -5,8 +5,10 @@ import org.springframework.web.bind.annotation.PostMapping; @@ -5,8 +5,10 @@ import org.springframework.web.bind.annotation.PostMapping;
5 import org.springframework.web.bind.annotation.RequestBody; 5 import org.springframework.web.bind.annotation.RequestBody;
6 import org.springframework.web.bind.annotation.RequestMapping; 6 import org.springframework.web.bind.annotation.RequestMapping;
7 import org.springframework.web.bind.annotation.RestController; 7 import org.springframework.web.bind.annotation.RestController;
  8 +import org.thingsboard.server.queue.util.TbCoreComponent;
8 9
9 @RestController 10 @RestController
  11 +@TbCoreComponent
10 @RequestMapping("/api/yt/noauth/test") 12 @RequestMapping("/api/yt/noauth/test")
11 public class TkTestController { 13 public class TkTestController {
12 @PostMapping 14 @PostMapping
@@ -29,6 +29,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkThirdUserEntity; @@ -29,6 +29,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkThirdUserEntity;
29 import org.thingsboard.server.dao.yunteng.service.TkTenantService; 29 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
30 import org.thingsboard.server.dao.yunteng.service.TkThirdPlatformService; 30 import org.thingsboard.server.dao.yunteng.service.TkThirdPlatformService;
31 import org.thingsboard.server.dao.yunteng.service.TkUserService; 31 import org.thingsboard.server.dao.yunteng.service.TkUserService;
  32 +import org.thingsboard.server.queue.util.TbCoreComponent;
32 import org.thingsboard.server.service.security.auth.yunteng.TkLoginResponse; 33 import org.thingsboard.server.service.security.auth.yunteng.TkLoginResponse;
33 import org.thingsboard.server.service.security.model.SecurityUser; 34 import org.thingsboard.server.service.security.model.SecurityUser;
34 import org.thingsboard.server.service.security.model.UserPrincipal; 35 import org.thingsboard.server.service.security.model.UserPrincipal;
@@ -45,6 +46,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -45,6 +46,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
45 * @author Administrator 46 * @author Administrator
46 */ 47 */
47 @RestController 48 @RestController
  49 +@TbCoreComponent
48 @RequestMapping("api/yt/third") 50 @RequestMapping("api/yt/third")
49 @Api(tags = {"第三方小程序"}) 51 @Api(tags = {"第三方小程序"})
50 @RequiredArgsConstructor 52 @RequiredArgsConstructor
@@ -12,10 +12,12 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; @@ -12,10 +12,12 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
12 import org.thingsboard.server.controller.BaseController; 12 import org.thingsboard.server.controller.BaseController;
13 import org.thingsboard.server.dao.yunteng.entities.TkUserCollectEntity; 13 import org.thingsboard.server.dao.yunteng.entities.TkUserCollectEntity;
14 import org.thingsboard.server.dao.yunteng.service.TkUserCollectService; 14 import org.thingsboard.server.dao.yunteng.service.TkUserCollectService;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 16
16 import java.util.List; 17 import java.util.List;
17 18
18 @RestController 19 @RestController
  20 +@TbCoreComponent
19 @RequiredArgsConstructor 21 @RequiredArgsConstructor
20 @RequestMapping("api/yt/collect") 22 @RequestMapping("api/yt/collect")
21 @Api(tags = {"收藏功能"}) 23 @Api(tags = {"收藏功能"})
@@ -44,6 +44,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -44,6 +44,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
44 import org.thingsboard.server.dao.user.UserService; 44 import org.thingsboard.server.dao.user.UserService;
45 import org.thingsboard.server.dao.yunteng.entities.SysUserEntity; 45 import org.thingsboard.server.dao.yunteng.entities.SysUserEntity;
46 import org.thingsboard.server.dao.yunteng.service.TkUserService; 46 import org.thingsboard.server.dao.yunteng.service.TkUserService;
  47 +import org.thingsboard.server.queue.util.TbCoreComponent;
47 import org.thingsboard.server.service.entitiy.customer.TbCustomerService; 48 import org.thingsboard.server.service.entitiy.customer.TbCustomerService;
48 import org.thingsboard.server.service.security.model.SecurityUser; 49 import org.thingsboard.server.service.security.model.SecurityUser;
49 import org.thingsboard.server.service.security.permission.Operation; 50 import org.thingsboard.server.service.security.permission.Operation;
@@ -60,6 +61,7 @@ import java.util.UUID; @@ -60,6 +61,7 @@ import java.util.UUID;
60 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 61 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
61 62
62 @RestController 63 @RestController
  64 +@TbCoreComponent
63 @RequestMapping("api/yt/user") 65 @RequestMapping("api/yt/user")
64 @Api(value = "用户接口") 66 @Api(value = "用户接口")
65 public class TkUserController extends AbstractUserAccount { 67 public class TkUserController extends AbstractUserAccount {
@@ -22,6 +22,7 @@ import org.thingsboard.server.controller.BaseController; @@ -22,6 +22,7 @@ import org.thingsboard.server.controller.BaseController;
22 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper; 22 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
23 import org.thingsboard.server.dao.yunteng.service.TkDeviceService; 23 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
24 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService; 24 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
  25 +import org.thingsboard.server.queue.util.TbCoreComponent;
25 26
26 import java.util.HashMap; 27 import java.util.HashMap;
27 import java.util.List; 28 import java.util.List;
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
30 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE; 31 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
31 32
32 @RestController 33 @RestController
  34 +@TbCoreComponent
33 @RequestMapping("api/yt/video/channel") 35 @RequestMapping("api/yt/video/channel")
34 @Api(tags = {"视频通道"}) 36 @Api(tags = {"视频通道"})
35 @RequiredArgsConstructor 37 @RequiredArgsConstructor
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
19 import org.thingsboard.server.controller.BaseController; 19 import org.thingsboard.server.controller.BaseController;
20 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity; 20 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
21 import org.thingsboard.server.dao.yunteng.service.TkVideoService; 21 import org.thingsboard.server.dao.yunteng.service.TkVideoService;
  22 +import org.thingsboard.server.queue.util.TbCoreComponent;
22 23
23 import java.io.IOException; 24 import java.io.IOException;
24 import java.util.HashMap; 25 import java.util.HashMap;
@@ -28,6 +29,7 @@ import java.util.Map; @@ -28,6 +29,7 @@ import java.util.Map;
28 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 29 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
29 30
30 @RestController 31 @RestController
  32 +@TbCoreComponent
31 @RequestMapping("api/yt/video") 33 @RequestMapping("api/yt/video")
32 @Api(tags = {"视频流"}) 34 @Api(tags = {"视频流"})
33 @RequiredArgsConstructor 35 @RequiredArgsConstructor
@@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; @@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
16 import org.thingsboard.server.controller.BaseController; 16 import org.thingsboard.server.controller.BaseController;
17 import org.thingsboard.server.dao.yunteng.entities.TkVideoPlatformEntity; 17 import org.thingsboard.server.dao.yunteng.entities.TkVideoPlatformEntity;
18 import org.thingsboard.server.dao.yunteng.service.TkVideoPlatformService; 18 import org.thingsboard.server.dao.yunteng.service.TkVideoPlatformService;
  19 +import org.thingsboard.server.queue.util.TbCoreComponent;
19 20
20 import java.util.List; 21 import java.util.List;
21 22
22 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*; 23 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
23 24
24 @RestController 25 @RestController
  26 +@TbCoreComponent
25 @RequestMapping("api/yt/video/platform") 27 @RequestMapping("api/yt/video/platform")
26 @Api(tags = {"流媒体平台配置"}) 28 @Api(tags = {"流媒体平台配置"})
27 @RequiredArgsConstructor 29 @RequiredArgsConstructor