Showing
8 changed files
with
108 additions
and
3 deletions
... | ... | @@ -86,6 +86,9 @@ import org.thingsboard.server.service.edge.rpc.yunteng.sys_tenant.SysTenantRepos |
86 | 86 | import org.thingsboard.server.service.edge.rpc.yunteng.sys_user.SysUserRepository; |
87 | 87 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_alarm_contact.TkAlarmContactRepository; |
88 | 88 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_alarm_profile.TkAlarmProfileRepository; |
89 | +import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_center.TkConfigurationCenterRepository; | |
90 | +import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content.TkConfigurationContentRepository; | |
91 | +import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content_node.TkConfigurationContentNodeRepository; | |
89 | 92 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_profile_category.TkDeviceProfileCategoryRepository; |
90 | 93 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_state_log.TkDeviceStateLogRepository; |
91 | 94 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_event_kv.TkEventKvRepository; |
... | ... | @@ -321,5 +324,11 @@ public class EdgeContextComponent { |
321 | 324 | private final TkThingsModelRepository tkThingsModelRepository; |
322 | 325 | @Autowired |
323 | 326 | private final SysTenantRepository sysTenantRepository; |
327 | + @Autowired | |
328 | + private final TkConfigurationCenterRepository tkConfigurationCenterRepository; | |
329 | + @Autowired | |
330 | + private final TkConfigurationContentRepository tkConfigurationContentRepository; | |
331 | + @Autowired | |
332 | + private final TkConfigurationContentNodeRepository tkConfigurationContentNodeRepository; | |
324 | 333 | //thingskit end |
325 | 334 | } | ... | ... |
... | ... | @@ -45,6 +45,9 @@ import org.thingsboard.server.service.edge.rpc.yunteng.sys_tenant.SysTenantEdgeE |
45 | 45 | import org.thingsboard.server.service.edge.rpc.yunteng.sys_user.SysUserEdgeEventFetcher; |
46 | 46 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_alarm_contact.TkAlarmContactEdgeEventFetcher; |
47 | 47 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_alarm_profile.TkAlarmProfileEdgeEventFetcher; |
48 | +import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_center.TkConfigurationCenterEdgeEventFetcher; | |
49 | +import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content.TkConfigurationContentEdgeEventFetcher; | |
50 | +import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content_node.TkConfigurationContentNodeEdgeEventFetcher; | |
48 | 51 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_profile_category.TkDeviceProfileCategoryEdgeEventFetcher; |
49 | 52 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_state_log.TkDeviceStateLogEdgeEventFetcher; |
50 | 53 | import org.thingsboard.server.service.edge.rpc.yunteng.tk_java_script.TkJavaScriptEdgeEventFetcher; |
... | ... | @@ -96,6 +99,10 @@ public class EdgeSyncCursor { |
96 | 99 | fetchers.add(new MessageConfigEdgeEventFetcher(ctx.getMessageConfigRepository()));//消息字典 |
97 | 100 | fetchers.add(new TkMessageTemplateEdgeEventFetcher(ctx.getTkMessageTemplateRepository()));//消息模板 |
98 | 101 | fetchers.add(new TkOrganizationEdgeEventFetcher(ctx.getTkOrganizationRepository()));//组织 |
102 | + | |
103 | + fetchers.add(new TkConfigurationCenterEdgeEventFetcher(ctx.getTkConfigurationCenterRepository())); | |
104 | + fetchers.add(new TkConfigurationContentEdgeEventFetcher(ctx.getTkConfigurationContentRepository())); | |
105 | + fetchers.add(new TkConfigurationContentNodeEdgeEventFetcher(ctx.getTkConfigurationContentNodeRepository())); | |
99 | 106 | //thingsKit end |
100 | 107 | |
101 | 108 | fetchers.add(new DashboardsEdgeEventFetcher(ctx.getDashboardService())); | ... | ... |
1 | +package org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_center; | |
2 | + | |
3 | +import lombok.AllArgsConstructor; | |
4 | +import lombok.extern.slf4j.Slf4j; | |
5 | +import org.thingsboard.server.common.data.EdgeUtils; | |
6 | +import org.thingsboard.server.common.data.edge.Edge; | |
7 | +import org.thingsboard.server.common.data.edge.EdgeEvent; | |
8 | +import org.thingsboard.server.common.data.edge.EdgeEventActionType; | |
9 | +import org.thingsboard.server.common.data.edge.EdgeEventType; | |
10 | +import org.thingsboard.server.common.data.id.TenantId; | |
11 | +import org.thingsboard.server.common.data.page.PageData; | |
12 | +import org.thingsboard.server.common.data.page.PageLink; | |
13 | +import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationCenter; | |
14 | +import org.thingsboard.server.common.data.yunteng.sync.TkDeviceProfileCategory; | |
15 | +import org.thingsboard.server.service.edge.rpc.fetch.BasePageableEdgeEventFetcher; | |
16 | +@AllArgsConstructor | |
17 | +@Slf4j | |
18 | +public class TkConfigurationCenterEdgeEventFetcher extends BasePageableEdgeEventFetcher<TkConfigurationCenter> { | |
19 | + private TkConfigurationCenterRepository tkConfigurationCenterRepository; | |
20 | + @Override | |
21 | + protected PageData<TkConfigurationCenter> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) { | |
22 | + return tkConfigurationCenterRepository.selectToEdge(tenantId,edge.getId(),pageLink); | |
23 | + } | |
24 | + | |
25 | + @Override | |
26 | + protected EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, TkConfigurationCenter entity) { | |
27 | + return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TK_CONFIGURATION_CENTER,EdgeEventActionType.UPDATED, entity.getId(), null); | |
28 | + } | |
29 | +} | ... | ... |
... | ... | @@ -43,7 +43,7 @@ public class TkConfigurationCenterRepository implements TkEdgeProcessorRepositor |
43 | 43 | } |
44 | 44 | |
45 | 45 | @Override |
46 | - public PageData selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink) { | |
46 | + public PageData<TkConfigurationCenter> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink) { | |
47 | 47 | LambdaQueryWrapper<TkConfigurationCenterEntity> queryWrapper = Wrappers.lambdaQuery(); |
48 | 48 | queryWrapper.eq(TkConfigurationCenterEntity::getTenantId, tenantId.getId().toString()); |
49 | 49 | Page<TkConfigurationCenterEntity> queryPage = new Page<>(pageLink.getPage(), pageLink.getPageSize()); | ... | ... |
1 | +package org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content; | |
2 | + | |
3 | +import lombok.AllArgsConstructor; | |
4 | +import lombok.extern.slf4j.Slf4j; | |
5 | +import org.thingsboard.server.common.data.EdgeUtils; | |
6 | +import org.thingsboard.server.common.data.edge.Edge; | |
7 | +import org.thingsboard.server.common.data.edge.EdgeEvent; | |
8 | +import org.thingsboard.server.common.data.edge.EdgeEventActionType; | |
9 | +import org.thingsboard.server.common.data.edge.EdgeEventType; | |
10 | +import org.thingsboard.server.common.data.id.TenantId; | |
11 | +import org.thingsboard.server.common.data.page.PageData; | |
12 | +import org.thingsboard.server.common.data.page.PageLink; | |
13 | +import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationCenter; | |
14 | +import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContent; | |
15 | +import org.thingsboard.server.service.edge.rpc.fetch.BasePageableEdgeEventFetcher; | |
16 | + | |
17 | +@AllArgsConstructor | |
18 | +@Slf4j | |
19 | +public class TkConfigurationContentEdgeEventFetcher extends BasePageableEdgeEventFetcher<TkConfigurationContent> { | |
20 | + TkConfigurationContentRepository TkConfigurationContentRepository; | |
21 | + @Override | |
22 | + protected PageData<TkConfigurationContent> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) { | |
23 | + return TkConfigurationContentRepository.selectToEdge(tenantId,edge.getId(),pageLink); | |
24 | + } | |
25 | + | |
26 | + @Override | |
27 | + protected EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, TkConfigurationContent entity) { | |
28 | + return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TK_CONFIGURATION_CONTENT, EdgeEventActionType.UPDATED, entity.getId(), null); | |
29 | + } | |
30 | +} | ... | ... |
... | ... | @@ -39,7 +39,7 @@ public class TkConfigurationContentRepository implements TkEdgeProcessorReposito |
39 | 39 | } |
40 | 40 | |
41 | 41 | @Override |
42 | - public PageData selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink) { | |
42 | + public PageData<TkConfigurationContent> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink) { | |
43 | 43 | LambdaQueryWrapper<TkConfigurationContentEntity> queryWrapper = Wrappers.lambdaQuery(); |
44 | 44 | queryWrapper.eq(TkConfigurationContentEntity::getTenantId, tenantId.getId().toString()); |
45 | 45 | Page<TkConfigurationContentEntity> queryPage = new Page<>(pageLink.getPage(), pageLink.getPageSize()); | ... | ... |
1 | +package org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content_node; | |
2 | + | |
3 | +import lombok.AllArgsConstructor; | |
4 | +import lombok.extern.slf4j.Slf4j; | |
5 | +import org.thingsboard.server.common.data.EdgeUtils; | |
6 | +import org.thingsboard.server.common.data.edge.Edge; | |
7 | +import org.thingsboard.server.common.data.edge.EdgeEvent; | |
8 | +import org.thingsboard.server.common.data.edge.EdgeEventActionType; | |
9 | +import org.thingsboard.server.common.data.edge.EdgeEventType; | |
10 | +import org.thingsboard.server.common.data.id.TenantId; | |
11 | +import org.thingsboard.server.common.data.page.PageData; | |
12 | +import org.thingsboard.server.common.data.page.PageLink; | |
13 | +import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContent; | |
14 | +import org.thingsboard.server.common.data.yunteng.sync.TkConfigurationContentNode; | |
15 | +import org.thingsboard.server.service.edge.rpc.fetch.BasePageableEdgeEventFetcher; | |
16 | +@AllArgsConstructor | |
17 | +@Slf4j | |
18 | +public class TkConfigurationContentNodeEdgeEventFetcher extends BasePageableEdgeEventFetcher<TkConfigurationContentNode> { | |
19 | + TkConfigurationContentNodeRepository tkConfigurationContentNodeRepository; | |
20 | + @Override | |
21 | + protected PageData<TkConfigurationContentNode> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) { | |
22 | + return tkConfigurationContentNodeRepository.selectToEdge(tenantId,edge.getId(),pageLink); | |
23 | + } | |
24 | + | |
25 | + @Override | |
26 | + protected EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, TkConfigurationContentNode entity) { | |
27 | + return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TK_CONFIGURATION_CONTENT_NODE, EdgeEventActionType.UPDATED, entity.getId(), null); | |
28 | + | |
29 | + } | |
30 | +} | ... | ... |
... | ... | @@ -39,7 +39,7 @@ public class TkConfigurationContentNodeRepository implements TkEdgeProcessorRepo |
39 | 39 | } |
40 | 40 | |
41 | 41 | @Override |
42 | - public PageData selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink) { | |
42 | + public PageData<TkConfigurationContentNode> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink) { | |
43 | 43 | System.out.println(" 全量下行查询 TkConfigurationContentNode"); |
44 | 44 | |
45 | 45 | LambdaQueryWrapper<TkConfigurationContentNodeEntity> queryWrapper = Wrappers.lambdaQuery(); | ... | ... |