From 380f728de28c5973ee5507cc78173d560ff66c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sun, 19 Feb 2023 22:18:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E3=80=81=E8=A7=92=E8=89=B2=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationSwaggerDoc.xml | 16 +++++++++++++ .../Identity/RoleService.cs | 21 ++++++++++++++++++ .../Identity/UserService.cs | 20 +++++++++++++++++ .../rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db | Bin 118784 -> 118784 bytes Yi.RuoYi.Vue3/src/api/system/role.js | 2 +- Yi.RuoYi.Vue3/src/api/system/user.js | 2 +- Yi.RuoYi.Vue3/src/views/system/role/index.vue | 6 ++--- Yi.RuoYi.Vue3/src/views/system/user/index.vue | 3 ++- 8 files changed, 64 insertions(+), 6 deletions(-) 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 28712623e0aea9edf3670a90fb10499cd698f284..78480b0aafe89fcd53882c37a187c2f96e2dc7a7 100644 GIT binary patch delta 294 zcmZozz}~QceS$P&)I=F)#;A=63;X%`k1??D3o!7X;_u@3;}_U0=x~&8^3{1CxfmE2 zSWFms*f@+QpP8?``Sbkg^(Ijl{h9+`p5bN48d(|NU1{oF>Ha0e~sbEkS$UY*7$GXBU)N{Uq1Og6YP PfCeMnwEdbtqgDd|(O^{h delta 257 zcmZozz}~QceS$P&*hCp;#;}bE3;X#Q7#LXi1sM2`@ptk2@e6DgbU4a4`RcrnY!-|> zY#i2;FU(h-{BNG%rUhN~CVUM44hb-d^$72p<|M!%*0p2yszU-yGAt}?Y;0mv!Lkf! zvW(mJ$un{Y2tu^7@-VY8LR3z_uFt5;!_2>cf&U8sKK=##O+c%Q_%-=oG1vf2>rr@P z?F6(7Xvann4Yd @@ -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(() => {