From 6d1404230cd1f950b531540f9196095ef350f0e9 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 5 Jul 2017 20:05:11 +0300 Subject: [PATCH] Fix: Delete tenant assets --- .../org/thingsboard/server/dao/tenant/TenantServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java index 678e811681..3193b853ed 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java @@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.dashboard.DashboardService; import org.thingsboard.server.dao.device.DeviceService; @@ -56,6 +57,9 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe @Autowired private CustomerService customerService; + @Autowired + private AssetService assetService; + @Autowired private DeviceService deviceService; @@ -100,6 +104,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe customerService.deleteCustomersByTenantId(tenantId); widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId); dashboardService.deleteDashboardsByTenantId(tenantId); + assetService.deleteAssetsByTenantId(tenantId); deviceService.deleteDevicesByTenantId(tenantId); userService.deleteTenantAdmins(tenantId); ruleService.deleteRulesByTenantId(tenantId);