From 5d738d99fe4deecdc563c996f1fae826aba0f468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= Date: Fri, 9 Sep 2022 15:53:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebFirst/database/sqlite.db | Bin 143360 -> 155648 bytes .../Config/SwaggerDoc.xml | 14 +++ .../Controllers/LogController.cs | 8 +- .../Controllers/UserController.cs | 16 ++-- .../yi-sqlsugar-dev.db | Bin 110592 -> 118784 bytes .../Models/PageParModel.cs | 3 + .../IDictionaryInfoService.cs | 9 ++ .../IServiceTemplate/ILogService.cs | 9 +- .../IServiceTemplate/IRoleMenuService.cs | 9 ++ .../IServiceTemplate/ITenantService.cs | 9 ++ .../IServiceTemplate/IUserRoleService.cs | 9 ++ .../Yi.Framework.Interface/IUserService.cs | 9 ++ .../Yi.Framework.Model/LogEntity.cs | 6 +- .../ModelsTemplate/DictionaryEntity.cs | 30 +++---- .../ModelsTemplate/DictionaryInfoEntity.cs | 83 ++++++++++++++++++ .../ModelsTemplate/LogEntity.cs | 25 +++--- .../ModelsTemplate/MenuEntity.cs | 10 +++ .../ModelsTemplate/RoleEntity.cs | 10 +++ .../ModelsTemplate/TenantEntity.cs | 10 +++ .../ModelsTemplate/UserEntity.cs | 10 +++ .../ServiceTemplate/DictionaryInfoService.cs | 14 +++ .../ServiceTemplate/RoleMenuService.cs | 14 +++ .../ServiceTemplate/TenantService.cs | 14 +++ .../ServiceTemplate/UserRoleService.cs | 14 +++ .../Yi.Framework.Service/UserService.cs | 25 +++++- Yi.Vue3.X.RuoYi/src/utils/ruoyi.js | 8 +- .../src/views/system/user/index.vue | 12 +-- 27 files changed, 326 insertions(+), 54 deletions(-) create mode 100644 Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDictionaryInfoService.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleMenuService.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ITenantService.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserRoleService.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryInfoEntity.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryInfoService.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleMenuService.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/TenantService.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserRoleService.cs diff --git a/WebFirst/database/sqlite.db b/WebFirst/database/sqlite.db index 70e922b66b732e1d4a6e0c70b1ffb4db85c65447..b49bcebf8d0e651d4fcec6fde1ca4417d9d1cbd6 100644 GIT binary patch delta 1836 zcma)-ZA@EL7{|{!_uls2zT878$ZMg<#$}eax3?{Cp@ae@b7p83VjPJ^CUrvwLrynMp^UE?7r})9RAgnNB5MwkZLlbYgl$XgeZrgj# zeV%)MInVQdp3{R9?7`2uBUz>~06>BAOI(MK7P;Zr@UvQ{!(im7Tv*f59BgRXu{#*R zCjkB%aNO2ldv}tK%13cmO~>x;w)Q=gHFCn)I>a*y2jclSZ6ltK@DsB*ZrV_L@pn2Y zTZga3Jq36k|Apu9FL(<7gnz(e_&UBeVuh!%M)Bs8%;8|BZv_A>GNzmVgMcW{aOTb;(??eTRPnmu#yBJusFg+=o zj8Iyb?v#gT7N??Yaw1#wy)^VRTc$UGC&5)p|F*tMUu{U!{jB>yw_jJIOXg;{&$xHF z16-r_BBx{jU~jS?vpwuq{0)8s@4`NLvlZor>X~$HpP^s-l=flGoaRH#0Zl-Y%G_cG znZxvL&Q4#V`{*XxO>@+b)G+l5wVkq25Zy%Qv@x_71yCxy1uwvtU>(c?v*0Q=^5gvb zdqyUrx$jXWrfCYlumgnl5+JcLNB7Cg(lh~2hX3h+$TXh!)1j7A4sI_9Muo3n_ zF@+Y3O9`q%AlmhTYivaGAn-D`Mj*_6xuJLuEU8dwBlP;gl>(ve3tq+b+Xz~l8(L_$ zd*t;C1g;NUWg}p1@LJp|p*M67w{G=mu#|~fTkp&32iHc=Z9qj7l}dE-Arnf0f#|;i zN}*__6I}8oGqOjkZRlHsNTyo0)ee#&`yI%MNV;0I)pnAm7HzeMJfs$_VoO~vTDiiB zzF>_CQUHxG%ue|7&w@t8QYWb@xEb9*yTDiR&g=B)0kl|3YTRy?rNe`>h3S%AEK|N# zm#5rSR_-Zwh>}-yd5goQU(LsUGdJw5RhDepWK)+Y#oyJ^(caX#@6q<>J61ob9dY~e zsp&%>-8pqu5~Y=FZ@DNrTxDL#F9eA-?-IPDPV^U06u^Fk%A$m(CDe->z z#$^7I-y@cLN*(TE$x~V!9*qfM+tf3Wf2L@IE}jO6j{|%>VtOKkjr*6k|3V<#Iw6_V zXg%d_$x-4imE2;uDJG=E*J=21uy7)_UFZmzy-{rr~f06$*U&B@f#-;ph>8XzCshQhP^D|l+ zNO19`Fz{dDU&>#}@5L|2_nz+%-*UcgzLd?13LbphQ~Vg`9%SJ+XKI~LzVJMw35%_6tIl-AV~iTx7l<<@ zatN|tWpH3w$;>^UyM)_`N1R)5x_| zZy8@cpBOCsmro*v!j3_ z%l4frOghXO!0^&wkd@`&;NX>KWB>)cXL5cXj4m!I%FIhQG%#@7{#Ttzgn9Z_VJ5@v zPTEYDn3!5)AU<=_YmJ`nsK=zw)EWi$7mJf_Ya}=jSe#5+Bc?lkVKfGbg@e5~eS + + + 树形结构构建测试 + + + 用户管理 + + + 动态条件分页查询 + + + + + 更改用户状态 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/LogController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/LogController.cs index 0b4d7231..ab1333dd 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/LogController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/LogController.cs @@ -35,10 +35,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers { Random random = new Random(); var logList = new List() { - new LogEntity() { LogCreateTime = Convert.ToDateTime("2019-12-1"), Message = "jack"+random.Next() } , - new LogEntity() { LogCreateTime = Convert.ToDateTime("2022-02-1"), Message = "jack"+random.Next() }, - new LogEntity() { LogCreateTime = Convert.ToDateTime("2020-02-1"), Message = "jack"+random.Next() }, - new LogEntity() { LogCreateTime = Convert.ToDateTime("2021-12-1"), Message = "jack"+random.Next() } }; + new LogEntity() { CreateTime = Convert.ToDateTime("2019-12-1"), Message = "jack"+random.Next() } , + new LogEntity() { CreateTime = Convert.ToDateTime("2022-02-1"), Message = "jack"+random.Next() }, + new LogEntity() { CreateTime = Convert.ToDateTime("2020-02-1"), Message = "jack"+random.Next() }, + new LogEntity() { CreateTime = Convert.ToDateTime("2021-12-1"), Message = "jack"+random.Next() } }; return Result.Success().SetData(await _iLogService.AddListTest(logList)); } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs index 0a4b4055..436ccf56 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs @@ -29,10 +29,16 @@ namespace Yi.Framework.ApiMicroservice.Controllers _iUserService = iUserService; } + /// + /// 动态条件分页查询 + /// + /// + /// + /// [HttpGet] - public async Task PageList([FromQuery]UserEntity user, [FromQuery] PageParModel page) + public async Task PageList([FromQuery] UserEntity user, [FromQuery] PageParModel page) { - return Result.Success().SetData(new PageModel(await _iUserService._repository.GetListAsync(),100) ); + return Result.Success().SetData(await _iUserService.SelctPageList(user, page)); } /// @@ -42,10 +48,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// /// [HttpPut] - public async Task UpdateStatus(long userId,bool isDel) + public async Task UpdateStatus(long userId, bool isDel) { return Result.Success().SetData(await _iUserService._repository.UpdateIgnoreNullAsync(new UserEntity() { Id = userId, IsDeleted = isDel })); - + } @@ -56,7 +62,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// [Permission($"{nameof(UserEntity)}:add")] [HttpPost] - public override async Task Add(UserEntity entity) + public override async Task Add(UserEntity entity) { if (!await _iUserService.Exist(entity.UserName)) { 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 d933c4ae4729893e5b74b7f975ae863d5d158df4..5dfa25bd65b3ed6abc9b4347e7536b1d141bbb47 100644 GIT binary patch delta 1023 zcma)5PiWI%6wm9@q)FHAPnp@ATfY``jTBiOh%%UFZCAtkXJpyN#L>p(+g7%=l6JyC z*xc$A4^k~sJtz)DJa|y51aBTaDjvLgnjnIB6g-$@j;)>=lEeGG-}l}xzwf<`uhhm< zy3*UROAth#@$EmMd%+?5E^%ryb3=Wr!sAp2^@3nYg&>u-FYZ_Fb;pk0IRPn>Ek}Un zy1L-@^6Mw>pjMfM%fTSZq%;+4$<I@B2VZAJQMj^|-JTvD#A;KpoYbSx}I z1v!djVKg2^{>G%*;~=T>WQDCk!+>lJyET*Yf--T)1B$b+R4)c>e-5Wg?gW delta 440 zcmZozz~1nHZGyDmJq88_X&{CH#fdt`toIo7bOIVvwx%%7^%vwVV&Gz1!N7i&|2p3W zzIwJ5+l2xc{aH2}2)Hw`G%2yNZ(kF}sL06DBFo4={bD%dh3)-8jCzdIlfxKgnKd1G zCOdLyY!{DWe8sBF{)d5&S)GAzDqj%KbDkxf=QtN~6md8*tFvEbo6RA_@`x>Mv!Vbq zGgq^PIJ>y0C}Ugj_TTA@GZ>Y5xfB!vf;@d4gCZ5YT_Y7Vlsr?EG + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILogService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILogService.cs index 7320c588..dc8bf5c6 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILogService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILogService.cs @@ -1,12 +1,9 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.Models; using Yi.Framework.Repository; namespace Yi.Framework.Interface { - public partial interface ILogService : IBaseService - { - + public partial interface ILogService:IBaseService + { } } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleMenuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleMenuService.cs new file mode 100644 index 00000000..a9a7479a --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleMenuService.cs @@ -0,0 +1,9 @@ +using Yi.Framework.Model.Models; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface +{ + public partial interface IRoleMenuService:IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ITenantService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ITenantService.cs new file mode 100644 index 00000000..31f8a4a9 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ITenantService.cs @@ -0,0 +1,9 @@ +using Yi.Framework.Model.Models; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface +{ + public partial interface ITenantService:IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserRoleService.cs new file mode 100644 index 00000000..a299d0af --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserRoleService.cs @@ -0,0 +1,9 @@ +using Yi.Framework.Model.Models; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface +{ + public partial interface IUserRoleService:IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs index bda0620d..488490e8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Yi.Framework.Common.Models; using Yi.Framework.DTOModel; using Yi.Framework.Model.Models; using Yi.Framework.Repository; @@ -75,5 +76,13 @@ namespace Yi.Framework.Interface /// /// bool JudgePassword(UserEntity user, string password); + + /// + /// 动态条件分页查询 + /// + /// + /// + /// + Task>> SelctPageList(UserEntity user, PageParModel page); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs index 18aba3fb..a3951984 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs @@ -12,7 +12,11 @@ namespace Yi.Framework.Model.Models public partial class LogEntity { [SplitField] //分表字段 在插入的时候会根据这个字段插入哪个表，在更新删除的时候用这个字段找出相关表 - public DateTime? LogCreateTime { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryEntity.cs index 1b48af3e..23ac74bc 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryEntity.cs @@ -20,26 +20,16 @@ namespace Yi.Framework.Model.Models [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] public long Id { get; set; } /// + /// 字典名称 + /// + [SugarColumn(ColumnName="DicName" )] + public string DicName { get; set; } + /// /// 字典类型 /// [SugarColumn(ColumnName="DictType" )] public string DictType { get; set; } /// - /// 字典标签 - /// - [SugarColumn(ColumnName="DictLabel" )] - public string DictLabel { get; set; } - /// - /// 字典值 - /// - [SugarColumn(ColumnName="DictValue" )] - public string DictValue { get; set; } - /// - /// 是否为该类型的默认值 - /// - [SugarColumn(ColumnName="IsDefault" )] - public bool? IsDefault { get; set; } - /// /// 创建者 /// [SugarColumn(ColumnName="CreateUser" )] @@ -69,5 +59,15 @@ namespace Yi.Framework.Model.Models /// [SugarColumn(ColumnName="TenantId" )] public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName="OrderNum" )] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName="Remark" )] + public string Remark { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryInfoEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryInfoEntity.cs new file mode 100644 index 00000000..15d17ac2 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryInfoEntity.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +namespace Yi.Framework.Model.Models +{ + /// + /// 字典信息表 + /// + [SugarTable("DictionaryInfo")] + public partial class DictionaryInfoEntity:IBaseModelEntity + { + public DictionaryInfoEntity() + { + this.IsDeleted = false; + this.CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] + public long Id { get; set; } + /// + /// 字典类型 + /// + [SugarColumn(ColumnName="DictType" )] + public string DictType { get; set; } + /// + /// 字典标签 + /// + [SugarColumn(ColumnName="DictLabel" )] + public string DictLabel { get; set; } + /// + /// 字典值 + /// + [SugarColumn(ColumnName="DictValue" )] + public string DictValue { get; set; } + /// + /// 是否为该类型的默认值 + /// + [SugarColumn(ColumnName="IsDefault" )] + public bool? IsDefault { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName="CreateUser" )] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="CreateTime" )] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName="ModifyUser" )] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName="ModifyTime" )] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName="IsDeleted" )] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName="TenantId" )] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName="OrderNum" )] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName="Remark" )] + public string Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LogEntity.cs index db54343a..6317608e 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LogEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LogEntity.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.Json.Serialization; using SqlSugar; namespace Yi.Framework.Model.Models { /// /// 日志表 /// + public partial class LogEntity:IBaseModelEntity { public LogEntity() @@ -14,22 +16,15 @@ namespace Yi.Framework.Model.Models this.IsDeleted = false; this.CreateTime = DateTime.Now; } - /// - /// 1 - /// - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] public long Id { get; set; } - /// /// 创建者 /// [SugarColumn(ColumnName="CreateUser" )] public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } + /// /// 修改者 /// @@ -55,5 +50,15 @@ namespace Yi.Framework.Model.Models /// [SugarColumn(ColumnName="Message" )] public string Message { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName="OrderNum" )] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName="Remark" )] + public string Remark { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs index 9217ae7e..e4eb303b 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs @@ -94,5 +94,15 @@ namespace Yi.Framework.Model.Models /// [SugarColumn(ColumnName="IsShow" )] public bool? IsShow { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName="OrderNum" )] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName="Remark" )] + public string Remark { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs index 99c9da38..024827e3 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs @@ -59,5 +59,15 @@ namespace Yi.Framework.Model.Models /// [SugarColumn(ColumnName="RoleCode" )] public string RoleCode { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName="OrderNum" )] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName="Remark" )] + public string Remark { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/TenantEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/TenantEntity.cs index f3fdf91c..3c473c47 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/TenantEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/TenantEntity.cs @@ -54,5 +54,15 @@ namespace Yi.Framework.Model.Models /// [SugarColumn(ColumnName="TenantId" )] public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName="OrderNum" )] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName="Remark" )] + public string Remark { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs index 71eac2ad..ce0be875 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs @@ -109,5 +109,15 @@ namespace Yi.Framework.Model.Models /// [SugarColumn(ColumnName="Introduction" )] public string Introduction { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName="OrderNum" )] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName="Remark" )] + public string Remark { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryInfoService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryInfoService.cs new file mode 100644 index 00000000..7764cd2a --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryInfoService.cs @@ -0,0 +1,14 @@ +using SqlSugar; +using Yi.Framework.Interface; +using Yi.Framework.Model.Models; +using Yi.Framework.Repository; + +namespace Yi.Framework.Service +{ + public partial class DictionaryInfoService : BaseService, IDictionaryInfoService + { + public DictionaryInfoService(IRepository repository) : base(repository) + { + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleMenuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleMenuService.cs new file mode 100644 index 00000000..db43413e --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleMenuService.cs @@ -0,0 +1,14 @@ +using SqlSugar; +using Yi.Framework.Interface; +using Yi.Framework.Model.Models; +using Yi.Framework.Repository; + +namespace Yi.Framework.Service +{ + public partial class RoleMenuService : BaseService, IRoleMenuService + { + public RoleMenuService(IRepository repository) : base(repository) + { + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/TenantService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/TenantService.cs new file mode 100644 index 00000000..6093f532 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/TenantService.cs @@ -0,0 +1,14 @@ +using SqlSugar; +using Yi.Framework.Interface; +using Yi.Framework.Model.Models; +using Yi.Framework.Repository; + +namespace Yi.Framework.Service +{ + public partial class TenantService : BaseService, ITenantService + { + public TenantService(IRepository repository) : base(repository) + { + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserRoleService.cs new file mode 100644 index 00000000..d48f838e --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserRoleService.cs @@ -0,0 +1,14 @@ +using SqlSugar; +using Yi.Framework.Interface; +using Yi.Framework.Model.Models; +using Yi.Framework.Repository; + +namespace Yi.Framework.Service +{ + public partial class UserRoleService : BaseService, IUserRoleService + { + public UserRoleService(IRepository repository) : base(repository) + { + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs index 84d3d9dd..5f052ab6 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Yi.Framework.Common.Helper; +using Yi.Framework.Common.Models; using Yi.Framework.DTOModel; using Yi.Framework.Interface; using Yi.Framework.Model.Models; @@ -30,7 +31,7 @@ namespace Yi.Framework.Service } public async Task Exist(string userName, Action userAction = null) { - var user = await _repository.GetFirstAsync(u => u.UserName == userName&& u.IsDeleted==false); + var user = await _repository.GetFirstAsync(u => u.UserName == userName && u.IsDeleted == false); if (userAction != null) { userAction.Invoke(user); @@ -113,7 +114,7 @@ namespace Yi.Framework.Service //首先获取到该用户全部信息，导航到角色、菜单，(菜单需要去重,完全交给Set来处理即可) //得到用户 - var user = await _repository._Db.Queryable().Includes(u => u.Roles.Where(r=>r.IsDeleted==false).ToList(), r => r.Menus.Where(m=>m.IsDeleted==false).ToList()).InSingleAsync(userId); + var user = await _repository._Db.Queryable().Includes(u => u.Roles.Where(r => r.IsDeleted == false).ToList(), r => r.Menus.Where(m => m.IsDeleted == false).ToList()).InSingleAsync(userId); //得到角色集合 var roleList = user.Roles; @@ -140,12 +141,12 @@ namespace Yi.Framework.Service userRoleMenu.User = user; - + return userRoleMenu; } - public bool JudgePassword(UserEntity user,string password) + public bool JudgePassword(UserEntity user, string password) { if (user.Password == MD5Helper.SHA2Encode(password, user.Salt)) { @@ -153,5 +154,21 @@ namespace Yi.Framework.Service } return false; } + + + public async Task>> SelctPageList(UserEntity user, PageParModel page) + { + RefAsync total = 0; + var data = await _repository._Db.Queryable() + .WhereIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName)) + .WhereIF(!string.IsNullOrEmpty(user.Name), u => u.Name.Contains(user.Name)) + .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) + .ToPageListAsync(page.PageNum, page.PageSize, total); + + return new PageModel>(data, total); + } } } diff --git a/Yi.Vue3.X.RuoYi/src/utils/ruoyi.js b/Yi.Vue3.X.RuoYi/src/utils/ruoyi.js index 908e39be..9a9dc3d3 100644 --- a/Yi.Vue3.X.RuoYi/src/utils/ruoyi.js +++ b/Yi.Vue3.X.RuoYi/src/utils/ruoyi.js @@ -59,10 +59,12 @@ export function addDateRange(params, dateRange, propName) { search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; dateRange = Array.isArray(dateRange) ? dateRange : []; if (typeof (propName) === 'undefined') { - search.params['beginTime'] = dateRange[0]; - search.params['endTime'] = dateRange[1]; + // search.params['beginTime'] = dateRange[0]; + // search.params['endTime'] = dateRange[1]; + search.startTime=dateRange[0]; + search.endTime=dateRange[1]; } else { - search.params['begin' + propName] = dateRange[0]; + search.params['start' + propName] = dateRange[0]; search.params['end' + propName] = dateRange[1]; } return search; diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue index c8336fe0..d80094ff 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue @@ -37,18 +37,18 @@ @keyup.enter="handleQuery" /> - + - +