diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java index ec1188c31..ef142065a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java @@ -90,6 +90,16 @@ public class SysTenantController extends BaseController { return toAjax(iSysTenantService.updateByBo(bo)); } + /** + * 状态修改 + */ + @SaCheckPermission("system:tenantPackage:edit") + @Log(title = "租户套餐", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public R changeStatus(@RequestBody SysTenantBo bo) { + return toAjax(iSysTenantService.updateTenantStatus(bo)); + } + /** * 删除租户 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java index 9ee8ae8de..a7deb2613 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java @@ -41,6 +41,11 @@ public interface ISysTenantService { */ Boolean updateByBo(SysTenantBo bo); + /** + * 修改租户状态 + */ + int updateTenantStatus(SysTenantBo bo); + /** * 校验并批量删除租户信息 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index c7766b1aa..9aa7ed669 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -99,6 +99,18 @@ public class SysTenantServiceImpl implements ISysTenantService { return baseMapper.updateById(update) > 0; } + /** + * 修改租户状态 + * + * @param bo 租户信息 + * @return 结果 + */ + @Override + public int updateTenantStatus(SysTenantBo bo) { + SysTenant tenant = BeanUtil.toBean(bo, SysTenant.class); + return baseMapper.updateById(tenant); + } + /** * 保存前的数据校验 */ diff --git a/ruoyi-ui/src/api/system/tenant.js b/ruoyi-ui/src/api/system/tenant.js index fde22d302..66fbac516 100644 --- a/ruoyi-ui/src/api/system/tenant.js +++ b/ruoyi-ui/src/api/system/tenant.js @@ -35,6 +35,19 @@ export function updateTenant(data) { }) } +// 租户状态修改 +export function changeTenantStatus(id, status) { + const data = { + id, + status + } + return request({ + url: '/system/tenant/changeStatus', + method: 'put', + data: data + }) +} + // 删除租户 export function delTenant(id) { return request({ diff --git a/ruoyi-ui/src/views/system/tenant/index.vue b/ruoyi-ui/src/views/system/tenant/index.vue index c294b5c4b..cdff2f826 100644 --- a/ruoyi-ui/src/views/system/tenant/index.vue +++ b/ruoyi-ui/src/views/system/tenant/index.vue @@ -87,6 +87,7 @@ + @@ -97,7 +98,16 @@ {{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }} - + + +