简柏林 / thingskit · Commits

Commit 113ee2140d8d0c29b8fc4e46cd9aaac74d6d125c

Authored by xp.Huang
2 parents a7ccb9d3 7404f808

Merge branch '2024-10-30bug' into 'master_dev' 

fix: 新增时才创建默认设备配置

See merge request yunteng/thingskit!462
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
... ... @@ -289,11 +289,11 @@ public class TkAdminController extends BaseController {
289 289 if (isCreate) {
290 290 installScripts.createDefaultRuleChains(tbTenant.getId());
291 291 installScripts.createDefaultEdgeRuleChains(tbTenant.getId());
  292 + //Thingskit function
  293 + RuleChain ruleChain =ruleChainService.getRootTenantRuleChain(tbTenant.getId());
  294 + deviceProfileService.createDeviceProfile(tbTenant.getId(),"默认MQTT网关设备", DeviceTypeEnum.GATEWAY,ruleChain.getId());
  295 + deviceProfileService.createDeviceProfile(tbTenant.getId(),"默认MQTT直连设备", DeviceTypeEnum.DIRECT_CONNECTION,ruleChain.getId());
292 296 }
293   - //Thingskit function
294   - RuleChain ruleChain =ruleChainService.getRootTenantRuleChain(tbTenant.getId());
295   - deviceProfileService.createDeviceProfile(tbTenant.getId(),"默认MQTT网关设备", DeviceTypeEnum.GATEWAY,ruleChain.getId());
296   - deviceProfileService.createDeviceProfile(tbTenant.getId(),"默认MQTT直连设备", DeviceTypeEnum.DIRECT_CONNECTION,ruleChain.getId());
297 297
298 298 tenantProfileCache.evict(tbTenant.getId());
299 299 tbClusterService.onTenantChange(tbTenant, null);
... ...