Merge branch 'system-zyj' into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TenantConfigController.java

@@ -66,6 +66,17 @@ public class TenantConfigController {
         return ApiResult.success();
     }
 
+    /**
+     * 租户管理-租户单位配置-删除
+     * @param tenantId
+     * @return
+     */
+    @DeleteMapping("/delTenantData/{tenantId}")
+    public ApiResult<Void> delTenantData(@PathVariable("tenantId") Integer tenantId){
+        sysTenantService.delTenantData(tenantId);
+        return ApiResult.success();
+    }
+
     /**
      * 租户管理-租户单位配置-修改
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysTenantMapper.java

@@ -46,4 +46,15 @@ public interface SysTenantMapper extends CrudMapper<SysTenant> {
     void cloneSysMobileBanner(@Param("originalTenantId") Integer originalTenantId,@Param("tenantId") Integer tenantId,@Param("createBy") String createBy);
     void cloneSysTenantPlatform(@Param("originalTenantId") Integer originalTenantId,@Param("tenantId") Integer tenantId);
     void cloneSysMobileTenantMenu(@Param("originalTenantId") Integer originalTenantId,@Param("tenantId") Integer tenantId);
+
+    void delSysTenant(@Param("tenantId") Integer tenantId);
+    void delSysDept(@Param("tenantId") Integer tenantId);
+    void delSysUser(@Param("tenantId") Integer tenantId);
+    void delSysUserTenant(@Param("tenantId") Integer tenantId);
+    void delSysTenantConfig(@Param("tenantId") Integer tenantId);
+    void delSysTenantMenu(@Param("tenantId") Integer tenantId);
+    void delSysTenantPlatform(@Param("tenantId") Integer tenantId);
+    void delSysMobileBanner(@Param("tenantId") Integer tenantId);
+    void delSysMobileTenantConfig(@Param("tenantId") Integer tenantId);
+    void delSysMobileTenantMenu(@Param("tenantId") Integer tenantId);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysTenantService.java

@@ -28,6 +28,8 @@ public interface SysTenantService extends CrudService<SysTenant> {
 
     void cloneTenantData(SysTenant sysTenant);
 
+    void delTenantData(Integer tenantId);
+
     void updateTenantData(SysTenant sysTenant);
 
     CommonPage<SysTenantTwoVo> getTenantDataOne(String tenantName, String tenantManager, Integer page, Integer size);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantServiceImpl.java

@@ -174,6 +174,20 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         sysTenantPlatformService.updateTenantPlatform(tenantPlatformVo);
     }
 
+    @Override
+    public void delTenantData(Integer tenantId) {
+        sysTenantMapper.delSysTenant(tenantId);
+        sysTenantMapper.delSysDept(tenantId);
+        sysTenantMapper.delSysUser(tenantId);
+        sysTenantMapper.delSysUserTenant(tenantId);
+        sysTenantMapper.delSysTenantConfig(tenantId);
+        sysTenantMapper.delSysTenantMenu(tenantId);
+        sysTenantMapper.delSysTenantPlatform(tenantId);
+        sysTenantMapper.delSysMobileBanner(tenantId);
+        sysTenantMapper.delSysMobileTenantConfig(tenantId);
+        sysTenantMapper.delSysMobileTenantMenu(tenantId);
+    }
+
     @Override
     public void updateTenantData(SysTenant sysTenant) {
         sysTenant.setUpdateBy(SecurityUtils.getUsername());

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantMapper.xml

@@ -148,5 +148,35 @@
         </where>
     </insert>
 
+    <delete id="delSysTenant">
+        delete from sys_tenant WHERE id = #{tenantId}
+    </delete>
+    <delete id="delSysDept">
+        delete from sys_dept WHERE tenant_id = #{tenantId}
+    </delete>
+    <delete id="delSysUser">
+        delete from sys_user where tenant_id = #{tenantId}
+    </delete>
+    <delete id="delSysUserTenant">
+        delete from sys_user_tenant where tenant_id = #{tenantId}
+    </delete>
+    <delete id="delSysTenantConfig">
+        delete from sys_tenant_config where tenant_id = #{tenantId}
+    </delete>
+    <delete id="delSysTenantMenu">
+        delete from sys_tenant_menu where tenant_id = #{tenantId}
+    </delete>
+    <delete id="delSysTenantPlatform">
+        delete from sys_tenant_platform where tenant_id = #{tenantId}
+    </delete>
+    <delete id="delSysMobileBanner">
+        delete from sys_mobile_banner where tenant_id = #{tenantId}
+    </delete>
+    <delete id="delSysMobileTenantConfig">
+        delete from sys_mobile_tenant_config where tenant_id = #{tenantId}
+    </delete>
+    <delete id="delSysMobileTenantMenu">
+        delete from sys_mobile_tenant_menu where tenant_id = #{tenantId}
+    </delete>
 
 </mapper>