简柏林 / thingskit · Commits

Commit afc2868a0b0350efd03bc430a89af485ea538e06

Authored by xp.Huang
2 parents f1c3ef18 7b64454f

Merge branch 'microservice1117' into 'master' 

fix: 微服务模式规则引起无法启动问题修复

See merge request yunteng/thingskit!479
Inline Side-by-side
Showing 5 changed files with 10 additions and 0 deletions
@@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils; @@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
27 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 27 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
28 import org.thingsboard.server.controller.BaseController; 28 import org.thingsboard.server.controller.BaseController;
29 import org.thingsboard.server.dao.yunteng.service.Tk3dComponentService; 29 import org.thingsboard.server.dao.yunteng.service.Tk3dComponentService;
  30 +import org.thingsboard.server.queue.util.TbCoreComponent;
30 31
31 import javax.annotation.Resource; 32 import javax.annotation.Resource;
32 import java.io.File; 33 import java.io.File;
@@ -47,6 +48,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -47,6 +48,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
47 * @since 2024-10-14 48 * @since 2024-10-14
48 */ 49 */
49 @RestController 50 @RestController
  51 +@TbCoreComponent
50 @RequestMapping("api/yt/3d_component") 52 @RequestMapping("api/yt/3d_component")
51 @Api(tags = {"3D模型管理"}) 53 @Api(tags = {"3D模型管理"})
52 @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')") 54 @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.id.EntityIdProvider; @@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.id.EntityIdProvider;
12 import org.thingsboard.server.common.data.yunteng.id.TkConfigurationCenterId; 12 import org.thingsboard.server.common.data.yunteng.id.TkConfigurationCenterId;
13 import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationCenter; 13 import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationCenter;
14 import org.thingsboard.server.gen.edge.v1.TkUpdateMsg; 14 import org.thingsboard.server.gen.edge.v1.TkUpdateMsg;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessor; 16 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessor;
16 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository; 17 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
17 18
@@ -19,6 +20,7 @@ import java.util.UUID; @@ -19,6 +20,7 @@ import java.util.UUID;
19 20
20 @Slf4j 21 @Slf4j
21 @Component 22 @Component
  23 +@TbCoreComponent
22 @AllArgsConstructor 24 @AllArgsConstructor
23 public class TkConfigurationCenterEdgeProcessor extends TkEdgeProcessor<TkConfigurationCenterId, TkConfigurationCenter> { 25 public class TkConfigurationCenterEdgeProcessor extends TkEdgeProcessor<TkConfigurationCenterId, TkConfigurationCenter> {
24 26
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.id.EntityIdProvider; @@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.id.EntityIdProvider;
12 import org.thingsboard.server.common.data.yunteng.id.TkConfigurationContentId; 12 import org.thingsboard.server.common.data.yunteng.id.TkConfigurationContentId;
13 import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContent; 13 import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContent;
14 import org.thingsboard.server.gen.edge.v1.TkUpdateMsg; 14 import org.thingsboard.server.gen.edge.v1.TkUpdateMsg;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessor; 16 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessor;
16 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository; 17 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
17 18
@@ -19,6 +20,7 @@ import java.util.UUID; @@ -19,6 +20,7 @@ import java.util.UUID;
19 20
20 @Slf4j 21 @Slf4j
21 @Component 22 @Component
  23 +@TbCoreComponent
22 @AllArgsConstructor 24 @AllArgsConstructor
23 public class TkConfigurationContentEdgeProcessor extends TkEdgeProcessor<TkConfigurationContentId, TkConfigurationContent> { 25 public class TkConfigurationContentEdgeProcessor extends TkEdgeProcessor<TkConfigurationContentId, TkConfigurationContent> {
24 26
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.id.EntityIdProvider; @@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.id.EntityIdProvider;
12 import org.thingsboard.server.common.data.yunteng.id.TkConfigurationContentNodeId; 12 import org.thingsboard.server.common.data.yunteng.id.TkConfigurationContentNodeId;
13 import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContentNode; 13 import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContentNode;
14 import org.thingsboard.server.gen.edge.v1.TkUpdateMsg; 14 import org.thingsboard.server.gen.edge.v1.TkUpdateMsg;
  15 +import org.thingsboard.server.queue.util.TbCoreComponent;
15 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessor; 16 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessor;
16 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository; 17 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
17 18
@@ -19,6 +20,7 @@ import java.util.UUID; @@ -19,6 +20,7 @@ import java.util.UUID;
19 20
20 @Slf4j 21 @Slf4j
21 @Component 22 @Component
  23 +@TbCoreComponent
22 @AllArgsConstructor 24 @AllArgsConstructor
23 public class TkConfigurationContentNodeEdgeProcessor extends TkEdgeProcessor<TkConfigurationContentNodeId, TkConfigurationContentNode> { 25 public class TkConfigurationContentNodeEdgeProcessor extends TkEdgeProcessor<TkConfigurationContentNodeId, TkConfigurationContentNode> {
24 26
@@ -16,6 +16,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileCategoryEntity @@ -16,6 +16,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileCategoryEntity
16 import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvCompositeKey; 16 import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvCompositeKey;
17 import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvEntity; 17 import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvEntity;
18 import org.thingsboard.server.dao.yunteng.jpa.repository.event.EventKvRepository; 18 import org.thingsboard.server.dao.yunteng.jpa.repository.event.EventKvRepository;
  19 +import org.thingsboard.server.queue.util.TbCoreComponent;
19 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository; 20 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
20 import org.thingsboard.server.service.state.DeviceStateService; 21 import org.thingsboard.server.service.state.DeviceStateService;
21 22
@@ -23,6 +24,7 @@ import java.util.List; @@ -23,6 +24,7 @@ import java.util.List;
23 import java.util.Optional; 24 import java.util.Optional;
24 25
25 @Repository 26 @Repository
  27 +@TbCoreComponent
26 @AllArgsConstructor 28 @AllArgsConstructor
27 public class TkEventKvRepository implements TkEdgeProcessorRepository<TkEventKv> { 29 public class TkEventKvRepository implements TkEdgeProcessorRepository<TkEventKv> {
28 30