Browse Source
Merge pull request #9419 from volodymyr-babak/hotfix/tenantServicePublishEvent_sys_tenant_id_fix
tenant publish event fix: tenant_id instead sys_tenant_id to avoid br…
pull/9431/head
Andrew Shvayka
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
|
|
|
@ -197,7 +197,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten |
|
|
|
boolean create = tenant.getId() == null; |
|
|
|
Tenant savedTenant = tenantDao.save(tenant.getId(), tenant); |
|
|
|
publishEvictEvent(new TenantEvictEvent(savedTenant.getId(), create)); |
|
|
|
eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(TenantId.SYS_TENANT_ID).entityId(savedTenant.getId()).added(create).build()); |
|
|
|
eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedTenant.getId()).entityId(savedTenant.getId()).added(create).build()); |
|
|
|
if (tenant.getId() == null) { |
|
|
|
deviceProfileService.createDefaultDeviceProfile(savedTenant.getId()); |
|
|
|
assetProfileService.createDefaultAssetProfile(savedTenant.getId()); |
|
|
|
@ -244,7 +244,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten |
|
|
|
adminSettingsService.deleteAdminSettingsByTenantId(tenantId); |
|
|
|
tenantDao.removeById(tenantId, tenantId.getId()); |
|
|
|
publishEvictEvent(new TenantEvictEvent(tenantId, true)); |
|
|
|
eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(TenantId.SYS_TENANT_ID).entityId(tenantId).build()); |
|
|
|
eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(tenantId).build()); |
|
|
|
relationService.deleteEntityRelations(tenantId, tenantId); |
|
|
|
alarmService.deleteEntityAlarmRecordsByTenantId(tenantId); |
|
|
|
} |
|
|
|
|
