简柏林 / thingskit · Commits

Commit d1926c99ce32e7ed8fa2d2899fc23faca5eee9ad

Authored by 芯火源
1 parent b0e349c6

fix(DEFECT-1963): 微服务模式规则引擎无法启动问题修复

Inline Side-by-side
Showing 3 changed files with 6 additions and 0 deletions
@@ -23,11 +23,13 @@ import org.thingsboard.server.common.data.yunteng.dto.sip.StreamContentDTO; @@ -23,11 +23,13 @@ import org.thingsboard.server.common.data.yunteng.dto.sip.StreamContentDTO;
23 import org.thingsboard.server.common.data.yunteng.enums.PTZCommandEnum; 23 import org.thingsboard.server.common.data.yunteng.enums.PTZCommandEnum;
24 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; 24 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
25 import org.thingsboard.server.controller.BaseController; 25 import org.thingsboard.server.controller.BaseController;
  26 +import org.thingsboard.server.queue.util.TbCoreComponent;
26 import org.thingsboard.server.service.yunteng.media.TkVideoControlService; 27 import org.thingsboard.server.service.yunteng.media.TkVideoControlService;
27 28
28 @RestController 29 @RestController
29 @RequestMapping("api/yt/video/control") 30 @RequestMapping("api/yt/video/control")
30 @Api(tags = {"视频控制管理"}) 31 @Api(tags = {"视频控制管理"})
  32 +@TbCoreComponent
31 @RequiredArgsConstructor 33 @RequiredArgsConstructor
32 @Slf4j 34 @Slf4j
33 public class TkVideoControlController extends BaseController { 35 public class TkVideoControlController extends BaseController {
@@ -16,10 +16,12 @@ import org.thingsboard.server.common.data.yunteng.dto.sip.hook.param.*; @@ -16,10 +16,12 @@ import org.thingsboard.server.common.data.yunteng.dto.sip.hook.param.*;
16 import org.thingsboard.server.controller.BaseController; 16 import org.thingsboard.server.controller.BaseController;
17 import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerService; 17 import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerService;
18 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService; 18 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
  19 +import org.thingsboard.server.queue.util.TbCoreComponent;
19 import org.thingsboard.server.service.yunteng.media.TkVideoControlService; 20 import org.thingsboard.server.service.yunteng.media.TkVideoControlService;
20 21
21 /** ZLMediaServer的hook事件监听 */ 22 /** ZLMediaServer的hook事件监听 */
22 @RestController 23 @RestController
  24 +@TbCoreComponent
23 @RequestMapping("api/index/hook") 25 @RequestMapping("api/index/hook")
24 @Api(tags = {"ZLMediaServer的hook事件监听"}) 26 @Api(tags = {"ZLMediaServer的hook事件监听"})
25 @RequiredArgsConstructor 27 @RequiredArgsConstructor
@@ -39,10 +39,12 @@ import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; @@ -39,10 +39,12 @@ import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
39 import org.thingsboard.server.dao.util.yunteng.ZLMediaKitTaskUtils; 39 import org.thingsboard.server.dao.util.yunteng.ZLMediaKitTaskUtils;
40 import org.thingsboard.server.dao.yunteng.service.TkDeviceService; 40 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
41 import org.thingsboard.server.dao.yunteng.service.media.*; 41 import org.thingsboard.server.dao.yunteng.service.media.*;
  42 +import org.thingsboard.server.queue.util.TbCoreComponent;
42 import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService; 43 import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
43 import org.thingsboard.server.service.security.model.SecurityUser; 44 import org.thingsboard.server.service.security.model.SecurityUser;
44 45
45 @Service 46 @Service
  47 +@TbCoreComponent
46 @RequiredArgsConstructor 48 @RequiredArgsConstructor
47 @Slf4j 49 @Slf4j
48 public class TkVideoControlServiceImpl implements TkVideoControlService { 50 public class TkVideoControlServiceImpl implements TkVideoControlService {