diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml index 1cd9c7cf..f3dd3fec 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml @@ -128,6 +128,14 @@ + + + 更新状态 + + + + + User服务实现 @@ -163,6 +171,14 @@ + + + 更新状态 + + + + + Config服务实现 diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs index 0f30eb53..bf516fd0 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Identity; using Yi.Framework.Uow; using Yi.Framework.Ddd.Dtos; using SqlSugar; +using Microsoft.AspNetCore.Mvc; namespace Yi.RBAC.Application.Identity { @@ -80,5 +81,25 @@ namespace Yi.RBAC.Application.Identity } return dto; } + + + /// + /// 更新状态 + /// + /// + /// + /// + [Route("/api/role/{id}/{state}")] + public async Task UpdateStateAsync([FromRoute] long id, [FromRoute] bool state) + { + var entity = await _repository.GetByIdAsync(id); + if (entity is null) + { + throw new ApplicationException("角色未存在"); + } + + entity.State = state; + return await MapToGetOutputDtoAsync(entity); + } } } diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs index 252a5686..eeb4f56a 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs @@ -10,6 +10,7 @@ using Yi.Framework.Ddd.Dtos; using Yi.RBAC.Domain.Identity.Repositories; using SqlSugar; using Mapster; +using Microsoft.AspNetCore.Mvc; namespace Yi.RBAC.Application.Identity { @@ -132,5 +133,24 @@ namespace Yi.RBAC.Application.Identity } return await MapToGetOutputDtoAsync(entity); } + + /// + /// 更新状态 + /// + /// + /// + /// + [Route("/api/user/{id}/{state}")] + public async Task UpdateStateAsync([FromRoute] long id,[FromRoute] bool state) + { + var entity = await _repository.GetByIdAsync(id); + if (entity is null) + { + throw new ApplicationException("用户未存在"); + } + + entity.State = state; + return await MapToGetOutputDtoAsync(entity); + } } } diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db index 28712623..78480b0a 100644 Binary files a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db differ diff --git a/Yi.RuoYi.Vue3/src/api/system/role.js b/Yi.RuoYi.Vue3/src/api/system/role.js index fd254bc7..88b9bbf2 100644 --- a/Yi.RuoYi.Vue3/src/api/system/role.js +++ b/Yi.RuoYi.Vue3/src/api/system/role.js @@ -49,7 +49,7 @@ export function dataScope(data) { // 角色状态修改 export function changeRoleStatus(roleId, isDel) { return request({ - url: `/role/updateStatus?roleId=${roleId}&isDel=${isDel}`, + url: `/role/${roleId}/${isDel}`, method: 'put' }) } diff --git a/Yi.RuoYi.Vue3/src/api/system/user.js b/Yi.RuoYi.Vue3/src/api/system/user.js index 0ab0332c..bf3f580e 100644 --- a/Yi.RuoYi.Vue3/src/api/system/user.js +++ b/Yi.RuoYi.Vue3/src/api/system/user.js @@ -61,7 +61,7 @@ export function resetUserPwd(id, password) { // 用户状态修改 export function changeUserStatus(userId, isDel) { return request({ - url: `/user/updateStatus?userId=${userId}&isDel=${isDel}`, + url: `/user/${userId}/${isDel}`, method: 'put' }) } diff --git a/Yi.RuoYi.Vue3/src/views/system/role/index.vue b/Yi.RuoYi.Vue3/src/views/system/role/index.vue index 3afdeab1..55443a3d 100644 --- a/Yi.RuoYi.Vue3/src/views/system/role/index.vue +++ b/Yi.RuoYi.Vue3/src/views/system/role/index.vue @@ -51,7 +51,7 @@ @@ -296,7 +296,7 @@ function handleSelectionChange(selection) { } /** 角色状态修改 */ function handleStatusChange(row) { - let text = row.state === false ? "启用" : "停用"; + let text = row.state === true ? "启用" : "停用"; proxy.$modal .confirm('确认要"' + text + '""' + row.roleName + '"角色吗?') .then(function () { @@ -306,7 +306,7 @@ function handleStatusChange(row) { proxy.$modal.msgSuccess(text + "成功"); }) .catch(function () { - row.state = row.state === "0" ? "1" : "0"; + row.state = row.state === true ? false : true; }); } /** 更多操作 */ diff --git a/Yi.RuoYi.Vue3/src/views/system/user/index.vue b/Yi.RuoYi.Vue3/src/views/system/user/index.vue index 469f0f60..7869e9eb 100644 --- a/Yi.RuoYi.Vue3/src/views/system/user/index.vue +++ b/Yi.RuoYi.Vue3/src/views/system/user/index.vue @@ -375,7 +375,8 @@ function handleExport() { }; /** 用户状态修改 */ function handleStatusChange(row) { - let text = row.state === false ? "启用" : "停用"; + console.log(row.state); + let text = row.state === true ? "启用" : "停用"; proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () { return changeUserStatus(row.id, row.state); }).then(() => {