From c15c43dba4e61c341a5a0687e226a59b576e1254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= Date: Fri, 9 Sep 2022 16:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/SwaggerDoc.xml | 13 ++++++++++ .../Controllers/MenuController.cs | 16 ++++++++---- .../Controllers/RoleController.cs | 9 +++++-- .../yi-sqlsugar-dev.db | Bin 118784 -> 118784 bytes .../Yi.Framework.Interface/IMenuService.cs | 2 ++ .../Yi.Framework.Interface/IRoleService.cs | 2 ++ .../Yi.Framework.Service/MenuService.cs | 12 ++++++++- .../Yi.Framework.Service/RoleService.cs | 18 +++++++++++++ .../Yi.Framework.Service/UserService.cs | 2 +- .../src/views/system/menu/index.vue | 8 +++--- .../src/views/system/role/index.vue | 24 +++++++++--------- 11 files changed, 81 insertions(+), 25 deletions(-) diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index 5b5ff7b2..bc81ce88 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -141,6 +141,13 @@ 菜单管理 + + + 动态条件查询全部 + + + + 得到树形菜单 @@ -152,6 +159,12 @@ 角色管理 + + + 动态条件分页查询 + + + 给多用户设置多角色 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs index dd32986a..81ab9f17 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs @@ -20,7 +20,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// [ApiController] [Route("api/[controller]/[action]")] - public class MenuController + public class MenuController { private IMenuService _iMenuService; public MenuController(ILogger logger, IMenuService iMenuService) @@ -28,10 +28,16 @@ namespace Yi.Framework.ApiMicroservice.Controllers _iMenuService = iMenuService; } + + /// + /// 动态条件查询全部 + /// + /// + /// [HttpGet] - public async Task GetList() + public async Task GetList([FromQuery] MenuEntity menu) { - return Result.Success().SetData(await _iMenuService._repository.GetListAsync()); + return Result.Success().SetData(await _iMenuService.SelctGetList(menu)); } @@ -41,8 +47,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// [HttpGet] public async Task GetMenuTree() - { - return Result.Success().SetData(await _iMenuService. GetMenuTreeAsync()); + { + return Result.Success().SetData(await _iMenuService.GetMenuTreeAsync()); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs index cefe4d83..57b2bc89 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs @@ -29,12 +29,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers _iRoleService = iRoleService; } + /// + /// 动态条件分页查询 + /// + /// [HttpGet] - public async Task PageList() + public async Task PageList([FromQuery] RoleEntity role, [FromQuery] PageParModel page) { - return Result.Success().SetData(await _iRoleService._repository.GetListAsync()); + return Result.Success().SetData(await _iRoleService.SelctPageList(role, page)); } + /// /// 给多用户设置多角色 /// diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 5dfa25bd65b3ed6abc9b4347e7536b1d141bbb47..793982e83785f79fcc68ca5da8837b8fbf9a3ecd 100644 GIT binary patch delta 1401 zcmZuxYiJW$6h0?2xtU2aGijTdaq=*_HTZtSRJ%S)ZB@2gX|ak`Vp4n*g_J^5+q6x! zso)|iJ_Z~_1r;AZmIZBH5qyB?e?dim2*q6=D1!deAF`}>GEtKl1_ti^zVn^$oOACT zIp-KT=Q!rGq3d{H75!i9I4`NLwP1H@;MAn0V#@WOaF~yo-}uxiYj{1b-SUmjMwI|S z6dE|F$Szs2RhtWuaD;>LsLzY6`x)HOfA^31vYS{+L|6vPcu*-3`~X@AIMCz%tKP_~ zn}5ANeJ8RoTC-?z?XOFy$qyq25eT7^i;-Jk%PQoM;13odS>t{c-T@ ztZ0d7w!!v;E*E(?Ir)sIri4B=1s4cXH8A26kgkhQq+PV`Qz9#MK}P>GK2um{bCVE6 z>p6fbPQRCk=r7|HEVaH`pPr}}n;19IAWD5h1ub)aVx`!G))r5D)LyyJ>X2i$YTF`-I0;Jzfuyh@tw6V4V#EB_C9#D)1D$6dD1_0(QzKge8U zmWyjyaeS(0lFexE!Kc&MZs^naAhBlB>GP5wE6@aLj{~DFh3l10tt@sSg>C9YXW(a$ z2P4>P2FgEURCJ^l+n7P9G5+nv1xlw{mh_R5rd+6oiH4>g^wbqaJvB<;2^AV{gvx z&s2Cx5yKL`*N3~5ZBkj`rTy3vdJRs?&rWZ#GszM-)sKGTML#Z9Ix0dR;Nl*UHY-&IwdK4hiO4&Y`b=_$tY zO?y8;o0b&IVjBjrU5?qxxw<`wP0RymFhWCgAUl|1PF{P?5Vp>6AA(AauO{@i(nCfE zB5zd8(H87jE{_aht>Mm~Q;yk-<*Y_@?WK(nvfwk0W>ArnJSFinNxoYqhj#091~&Wc#x2@su!p-j6P{lZd3+dS<~?mSz6@itvfH0GnR~^)pQGJ9*y2wOqV6h1F)FTJI=_g-xa7bsv5C)3vZ(GMtNSTI6`iBJS|)KXhkbOJ*87KZp^ zG1(SBuF1Ov-Sp2`vQ3>h+}suuXR>5jvSeAd#2-txsA#gy{UGtjmSt~SE6`-Q$^G%1 zbDr}&=bU?wU(7y!G5d6W7CbmpSWDiYbYEg~jW*C33cyfcnqj`osW<*icO{;M4JA8i z^?>k2KER1`WT5~+fjT|#vz66B!46WHw4mghk#;tqHLHyU*VM&Ae$&0rKE6Nql_V=p zm)lcO$@<_XB_LAiqal}6LIHqKtUfNZY;xLVcZuZmI$d5-lto##iz&$C6(z6icF2{I zTT~y}dbP6$br$us%}nYpsC7k>b-Tt)0fIUJeTr5{(!N!6AydI@P1Z`PC7~dd+E#pi zCPOT7cq?JEE^X8Nuj}iP6C9+)Nn(jCdtGj?RN;`_M6uKLKcR{Ww-kvqhKF4P^#^2PBi?bxK~P!XYZ6?2=A&FLoou)o7NXP~!l7-0)FO zfzfITnih@A%&hSZcD?>SrRcsj)Mb~`cd4s-D}6Nkx^^Jvj`kPbq~?sq!939#7dCKt zS-5iu{ltaySxTU7RO-?|z;}nxOZeS5qWG||HpJkYaTM761LUnLkQhsOuB)_`3m0Z) zZyZLgeAto+zd4KoQKO9B9e2~qgdSwhXzwjMwUDbCBYblN9HP>=*@8+4Mxwn@tUs^i-I${6k@olc# zyjCNNe;h+C{LAYSuw|9Ts&UlBb)aOn9;%><+=PJ7k0Za0t^`3?F(i?Gk>ICU9JJ<; z;XN8h4t#19t;5|Di05?RS*@)YpPWFO_}=wvWhCK!e2iNQ+whYKGQpTB6YiNrokB;} zT6JJCyRLT<-}vY#vf#fa(N{Ui=GJ(#%})T52jg!j}Gvf?{asF{mp6Mb}f zItlRRX|!MY12&e?+nyeYr6@Q(PbPQo*5wE1K3_Wb!Gn`G_QntE6NMxv#SVCG8g-di z77Qsb(E`%v?`hP8yN6LWzA}VpYkVR;+|$>gTRRe5JB9pA2W6y+_2d_x;KSd%hMLUm w3}_D { Task> GetMenuTreeAsync(); + Task> SelctGetList(MenuEntity menu); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs index 58895248..5350f42b 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Yi.Framework.Common.Models; using Yi.Framework.Model.Models; using Yi.Framework.Repository; @@ -27,5 +28,6 @@ namespace Yi.Framework.Interface /// /// Task GiveRoleSetMenu(List roleIds, List menuIds); + Task>> SelctPageList(RoleEntity role, PageParModel page); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs index e85ef7f2..014dde7f 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs @@ -1,6 +1,7 @@ using SqlSugar; using System.Collections.Generic; using System.Threading.Tasks; +using Yi.Framework.Common.Models; using Yi.Framework.Interface; using Yi.Framework.Model.Models; using Yi.Framework.Repository; @@ -9,11 +10,20 @@ namespace Yi.Framework.Service { public partial class MenuService : BaseService, IMenuService { + public async Task> SelctGetList(MenuEntity menu) + { + var data = await _repository._Db.Queryable() + .WhereIF(!string.IsNullOrEmpty(menu.MenuName), u => u.MenuName.Contains(menu.MenuName)) + .Where(u => u.IsDeleted == false) + .OrderBy(u => u.OrderNum, OrderByType.Desc) + .ToListAsync(); + return data; + } public async Task> GetMenuTreeAsync() { //ParentId 0,代表为根目录，只能存在一个 //复杂查询直接使用db代理 - return await _repository._Db.Queryable().Where(u=>u.IsDeleted==false).ToTreeAsync(it=>it.Children,it=>it.ParentId,0); + return await _repository._Db.Queryable().Where(u => u.IsDeleted == false).ToTreeAsync(it => it.Children, it => it.ParentId, 0); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs index 52546893..6e0f68ea 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs @@ -1,6 +1,8 @@ using SqlSugar; +using System; using System.Collections.Generic; using System.Threading.Tasks; +using Yi.Framework.Common.Models; using Yi.Framework.Interface; using Yi.Framework.Model.Models; using Yi.Framework.Repository; @@ -46,5 +48,21 @@ namespace Yi.Framework.Service return await _repository._Db.Queryable().Includes(u => u.Menus).InSingleAsync(roleId); } + + + + public async Task>> SelctPageList(RoleEntity role, PageParModel page) + { + RefAsync total = 0; + var data = await _repository._Db.Queryable() + .WhereIF(!string.IsNullOrEmpty(role.RoleName), u => u.RoleName.Contains(role.RoleName)) + .WhereIF(!string.IsNullOrEmpty(role.RoleCode), u => u.RoleCode.Contains(role.RoleCode)) + .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) + .Where(u => u.IsDeleted == role.IsDeleted) + .OrderBy(u => u.OrderNum, OrderByType.Desc) + .ToPageListAsync(page.PageNum, page.PageSize, total); + + return new PageModel>(data, total); + } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs index 5f052ab6..c330927b 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs @@ -165,7 +165,7 @@ namespace Yi.Framework.Service .WhereIF(!string.IsNullOrEmpty(user.Phone), u => u.Phone.Contains(user.Phone)) .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) .Where(u => u.IsDeleted == false) - .OrderBy(u => u.OrderNum) + .OrderBy(u => u.OrderNum, OrderByType.Desc) .ToPageListAsync(page.PageNum, page.PageSize, total); return new PageModel>(data, total); diff --git a/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue index eb6747de..02f091dc 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue @@ -9,8 +9,8 @@ @keyup.enter="handleQuery" /> - - + + - + @@ -360,7 +360,7 @@ function reset() { isFrame: "1", isCache: "0", visible: "0", - status: "0" + isDeleted: "0" }; proxy.resetForm("menuRef"); } diff --git a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue index 8262d2f9..275dec07 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue @@ -10,18 +10,18 @@ @keyup.enter="handleQuery" /> - + - + - - + +