Commit a107f2606ebdb6fab756c8c0812c5e83359921b6

Authored by 黄 x
1 parent fe5d1efc

fix: 删除租户时,要删除租户的平台定制和转换配置

@@ -49,6 +49,9 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan @@ -49,6 +49,9 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
49 private final SceneLinkageService sceneLinkageService; 49 private final SceneLinkageService sceneLinkageService;
50 private final DoActionService doActionService; 50 private final DoActionService doActionService;
51 private final DoConditionService doConditionService; 51 private final DoConditionService doConditionService;
  52 + private final ConvertConfigService convertConfigService;
  53 + private final SysAppDesignService sysAppDesignService;
  54 + private final SysPlatformDesignService sysPlatformDesignService;
52 @Override 55 @Override
53 @Transactional 56 @Transactional
54 public TenantDTO createNewTenant(TenantReqDTO tenantReqDTO) { 57 public TenantDTO createNewTenant(TenantReqDTO tenantReqDTO) {
@@ -149,10 +152,15 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan @@ -149,10 +152,15 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
149 doActionService.deleteDataByTenantIds(tenantIds); 152 doActionService.deleteDataByTenantIds(tenantIds);
150 doConditionService.deleteDataByTenantIds(tenantIds); 153 doConditionService.deleteDataByTenantIds(tenantIds);
151 sceneLinkageService.deleteDataByTenantIds(tenantIds); 154 sceneLinkageService.deleteDataByTenantIds(tenantIds);
152 - // 13.DELETE TENANT_ROLE、TENANT_MENU 155 + // 13.DELETE CONVERT_CONFIG
  156 + convertConfigService.deleteDataByTenantIds(tenantIds);
  157 + // 14.DELETE APP_DESIGN PLATFORM_DESIGN
  158 + sysAppDesignService.deleteDataByTenantIds(tenantIds);
  159 + sysPlatformDesignService.deleteDataByTenantIds(tenantIds);
  160 + // 15.DELETE TENANT_ROLE、TENANT_MENU
153 deleteTenantRolesByTenantId(tenantIds); 161 deleteTenantRolesByTenantId(tenantIds);
154 deleteTenantMenusByTenantId(tenantIds); 162 deleteTenantMenusByTenantId(tenantIds);
155 - // 14. DELETE TENANT 163 + // 16. DELETE TENANT
156 baseMapper.deleteBatchIds(ids); 164 baseMapper.deleteBatchIds(ids);
157 165
158 166
@@ -75,7 +75,8 @@ public abstract class AbstractBaseService<M extends BaseMapper<T>, T extends Bas @@ -75,7 +75,8 @@ public abstract class AbstractBaseService<M extends BaseMapper<T>, T extends Bas
75 return page; 75 return page;
76 } 76 }
77 } 77 }
78 - 78 + @Transactional(rollbackFor = Exception.class)
  79 + @Override
79 public boolean deleteDataByTenantIds(Set<String> tenantIds) { 80 public boolean deleteDataByTenantIds(Set<String> tenantIds) {
80 if(tenantIds.isEmpty()){ 81 if(tenantIds.isEmpty()){
81 return false; 82 return false;
@@ -2,13 +2,14 @@ package org.thingsboard.server.dao.yunteng.service; @@ -2,13 +2,14 @@ package org.thingsboard.server.dao.yunteng.service;
2 2
3 3
4 import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO; 4 import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
  5 +import org.thingsboard.server.dao.yunteng.entities.SysAppDesign;
5 6
6 /** 7 /**
7 * @author: 徐浩然 8 * @author: 徐浩然
8 * @desc: 9 * @desc:
9 * @date: 2021/12/3-18:40 10 * @date: 2021/12/3-18:40
10 */ 11 */
11 -public interface SysAppDesignService { 12 +public interface SysAppDesignService extends BaseService<SysAppDesign>{
12 boolean save(SysAppDesignDTO sysAppDesignDTO,String tenantId); 13 boolean save(SysAppDesignDTO sysAppDesignDTO,String tenantId);
13 14
14 SysAppDesignDTO get(String tenantId); 15 SysAppDesignDTO get(String tenantId);
1 package org.thingsboard.server.dao.yunteng.service; 1 package org.thingsboard.server.dao.yunteng.service;
2 import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO; 2 import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
  3 +import org.thingsboard.server.dao.yunteng.entities.SysPlatformDesign;
3 4
4 /** 5 /**
5 * @author: 徐浩然 6 * @author: 徐浩然
6 * @desc: 7 * @desc:
7 * @date: 2021/12/3-18:39 8 * @date: 2021/12/3-18:39
8 */ 9 */
9 -public interface SysPlatformDesignService { 10 +public interface SysPlatformDesignService extends BaseService<SysPlatformDesign>{
10 boolean save(SysPlatformDesignDTO sysPlatformDesignDTO,String tenantId); 11 boolean save(SysPlatformDesignDTO sysPlatformDesignDTO,String tenantId);
11 12
12 SysPlatformDesignDTO get(String tenantId); 13 SysPlatformDesignDTO get(String tenantId);