From 71bbc27b1e9a0d30b2b4ec684a5b75c66ec96cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Thu, 9 Jun 2022 21:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../System/ArticleCategoryController.cs | 2 -- .../Controllers/System/ArticleController.cs | 6 ------ .../Controllers/System/SysConfigController.cs | 6 ------ .../System/SysDictDataController.cs | 6 ++++-- .../System/SysDictTypeController.cs | 3 +-- .../Controllers/System/SysNoticeController.cs | 8 ++----- .../Controllers/System/SysPostController.cs | 6 +++--- .../System/SysProfileController.cs | 1 - .../Controllers/System/SysRoleController.cs | 4 ++-- .../Controllers/System/TasksLogController.cs | 1 - .../System/monitor/SysLogininforController.cs | 3 --- .../CodeGenTemplate/TplControllers.txt | 12 +---------- .../wwwroot/CodeGenTemplate/TplIService.txt | 2 ++ .../wwwroot/CodeGenTemplate/TplService.txt | 18 ++++++++++++++++ ZR.CodeGenerator/CodeGeneratorTool.cs | 21 ++++++++++--------- 15 files changed, 44 insertions(+), 55 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs b/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs index eb89d60..08fef47 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs +++ b/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs @@ -104,12 +104,10 @@ namespace ZR.Admin.WebApi.Controllers { throw new CustomException("请求实体不能为空"); } - //从 Dto 映射到 实体 var modal = parm.Adapt().ToUpdate(HttpContext); var response = _ArticleCategoryService.Update(w => w.CategoryId == modal.CategoryId, it => new ArticleCategory() { - //Update 字段映射 Name = modal.Name, ParentId = modal.ParentId, }); diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs index 97d1dab..cb52d64 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs @@ -40,10 +40,8 @@ namespace ZR.Admin.WebApi.Controllers [ActionPermissionFilter(Permission = "system:article:list")] public IActionResult Query([FromQuery] ArticleQueryDto parm) { - //开始拼装查询条件 var predicate = Expressionable.Create
(); - //搜索条件 predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Title), m => m.Title.Contains(parm.Title)); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Status), m => m.Status == parm.Status); @@ -59,10 +57,7 @@ namespace ZR.Admin.WebApi.Controllers [HttpGet("newList")] public IActionResult QueryNew() { - //开始拼装查询条件 var predicate = Expressionable.Create
(); - - //搜索条件 predicate = predicate.And(m => m.Status == "1"); var response = _ArticleService.Queryable() @@ -99,7 +94,6 @@ namespace ZR.Admin.WebApi.Controllers { throw new CustomException("请求参数错误"); } - //从 Dto 映射到 实体 var addModel = parm.Adapt
().ToCreate(context: HttpContext); addModel.AuthorName = HttpContext.GetName(); diff --git a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs index 8ef15d1..d3b19a5 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs @@ -41,10 +41,8 @@ namespace ZR.Admin.WebApi.Controllers [ActionPermissionFilter(Permission = "system:config:list")] public IActionResult QuerySysConfig([FromQuery] SysConfigQueryDto parm) { - //开始拼装查询条件 var predicate = Expressionable.Create(); - //TODO 搜索条件 predicate = predicate.AndIF(!parm.ConfigType.IsEmpty(),m => m.ConfigType == parm.ConfigType); predicate = predicate.AndIF(!parm.ConfigName.IsEmpty(),m => m.ConfigName.Contains(parm.ConfigType)); predicate = predicate.AndIF(!parm.ConfigKey.IsEmpty(),m => m.ConfigKey.Contains(parm.ConfigKey)); @@ -79,7 +77,6 @@ namespace ZR.Admin.WebApi.Controllers [AllowAnonymous] public IActionResult GetConfigKey(string configKey) { - //TODO 增加缓存 var response = _SysConfigService.Queryable().First(f=> f.ConfigKey == configKey); return SUCCESS(response?.ConfigValue); @@ -98,7 +95,6 @@ namespace ZR.Admin.WebApi.Controllers { throw new CustomException("请求参数错误"); } - //从 Dto 映射到 实体 var model = parm.Adapt().ToCreate(HttpContext); return SUCCESS(_SysConfigService.Insert(model, it => new @@ -126,12 +122,10 @@ namespace ZR.Admin.WebApi.Controllers { throw new CustomException("请求实体不能为空"); } - //从 Dto 映射到 实体 var model = parm.Adapt().ToUpdate(HttpContext); var response = _SysConfigService.Update(w => w.ConfigId == model.ConfigId, it => new SysConfig() { - //Update 字段映射 ConfigName = model.ConfigName, ConfigKey = model.ConfigKey, ConfigValue = model.ConfigValue, diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs index f3badf1..b7b8c3e 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Linq; +using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; @@ -54,6 +55,7 @@ namespace ZR.Admin.WebApi.Controllers.System { return SUCCESS(SysDictDataService.SelectDictDataByType(dictType)); } + /// /// 根据字典类型查询字典数据信息 /// @@ -101,7 +103,7 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpPost()] public IActionResult Add([FromBody] SysDictData dict) { - dict.Create_by = User.Identity.Name; + dict.Create_by = HttpContext.GetName(); dict.Create_time = DateTime.Now; return SUCCESS(SysDictDataService.InsertDictData(dict)); } @@ -116,7 +118,7 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpPut()] public IActionResult Edit([FromBody] SysDictData dict) { - dict.Update_by = User.Identity.Name; + dict.Update_by = HttpContext.GetName(); return SUCCESS(SysDictDataService.UpdateDictData(dict)); } diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs index 7fdd5f4..8c7389b 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -67,8 +67,7 @@ namespace ZR.Admin.WebApi.Controllers.System { return ToResponse(ApiResult.Error($"新增字典'{dict.DictName}'失败，字典类型已存在")); } - //设置添加人 - dict.Create_by = HttpContext.User.Identity.Name; + dict.Create_by = HttpContext.GetName(); dict.Create_time = DateTime.Now; return SUCCESS(SysDictService.InsertDictType(dict)); } diff --git a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs index 2b513b4..a0265f8 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs @@ -44,10 +44,8 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpGet("queryNotice")] public IActionResult QueryNotice([FromQuery] SysNoticeQueryDto parm) { - //开始拼装查询条件 var predicate = Expressionable.Create(); - //搜索条件查询语法参考Sqlsugar predicate = predicate.And(m => m.Status == "0"); var response = _SysNoticeService.GetPages(predicate.ToExpression(), parm); return SUCCESS(response); @@ -61,10 +59,8 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:notice:list")] public IActionResult QuerySysNotice([FromQuery] SysNoticeQueryDto parm) { - //开始拼装查询条件 var predicate = Expressionable.Create(); - //搜索条件查询语法参考Sqlsugar predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeTitle), m => m.NoticeTitle.Contains(parm.NoticeTitle)); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeType), m => m.NoticeType == parm.NoticeType); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CreateBy), m => m.Create_by.Contains(parm.CreateBy) || m.Update_by.Contains(parm.CreateBy)); @@ -102,7 +98,7 @@ namespace ZR.Admin.WebApi.Controllers.System } //从 Dto 映射到 实体 var modal = parm.Adapt().ToCreate(HttpContext); - modal.Create_by = User.Identity.Name; + modal.Create_by = HttpContext.GetName(); modal.Create_time = DateTime.Now; int result = _SysNoticeService.Insert(modal, it => new @@ -143,7 +139,7 @@ namespace ZR.Admin.WebApi.Controllers.System NoticeContent = model.NoticeContent, Status = model.Status, Remark = model.Remark, - Update_by = User.Identity.Name, + Update_by = HttpContext.GetName(), Update_time = DateTime.Now }); diff --git a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs index 9143d49..a69dfeb 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs @@ -10,6 +10,7 @@ using Infrastructure.Enums; using Infrastructure; using ZR.Service.System.IService; using ZR.Common; +using ZR.Admin.WebApi.Extensions; namespace ZR.Admin.WebApi.Controllers.System { @@ -34,7 +35,6 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:post:list")] public IActionResult List([FromQuery] SysPost post, [FromQuery] PagerInfo pagerInfo) { - //开始拼装查询条件 var predicate = Expressionable.Create(); predicate = predicate.AndIF(post.Status.IfNotEmpty(), it => it.Status == post.Status); var list = PostService.GetPages(predicate.ToExpression(), pagerInfo, s => new { s.PostSort }); @@ -73,7 +73,7 @@ namespace ZR.Admin.WebApi.Controllers.System throw new CustomException($"修改岗位{post.PostName}失败，岗位编码已存在"); } - post.Create_by = User.Identity.Name; + post.Create_by = HttpContext.GetName(); return ToResponse(ToJson(PostService.Add(post))); } @@ -95,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers.System { throw new CustomException($"修改岗位{post.PostName}失败，岗位编码已存在"); } - post.Update_by = User.Identity.Name; + post.Update_by = HttpContext.GetName(); return ToResponse(PostService.Update(post)); } diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs index db3be8d..eb8dea1 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -78,7 +78,6 @@ namespace ZR.Admin.WebApi.Controllers.System { throw new CustomException(ResultCode.PARAM_ERROR, "请求参数错误"); } - //从 Dto 映射到 实体 var user = userDto.Adapt().ToUpdate(HttpContext); int result = UserService.ChangeUser(user); diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs index e9b7a0f..a79b551 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs @@ -71,7 +71,7 @@ namespace ZR.Admin.WebApi.Controllers.System return ToResponse(ApiResult.Error((int)ResultCode.CUSTOM_ERROR, $"新增角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); } - sysRoleDto.Create_by = User.Identity.Name; + sysRoleDto.Create_by = HttpContext.GetName(); long roleId = sysRoleService.InsertRole(sysRoleDto); return ToResponse(ToJson(roleId)); @@ -101,7 +101,7 @@ namespace ZR.Admin.WebApi.Controllers.System return ToResponse(ApiResult.Error($"编辑角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); } } - sysRoleDto.Update_by = User.Identity.Name; + sysRoleDto.Update_by = HttpContext.GetName(); int upResult = sysRoleService.UpdateRole(sysRoleDto); if (upResult > 0) { diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs index b105864..7deddda 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -36,7 +36,6 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpGet("list")] public IActionResult GetList([FromQuery] PagerInfo pager, [FromQuery] TasksLogQueryDto queryDto) { - //开始拼装查询条件 queryDto.BeginTime = DateTimeHelper.GetBeginTime(queryDto.BeginTime, -7); queryDto.EndTime = DateTimeHelper.GetBeginTime(queryDto.EndTime, 7); diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs index b56b80e..f66d19e 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -29,7 +29,6 @@ namespace ZR.Admin.WebApi.Controllers.monitor /// /// 查询登录日志 - /// /monitor/logininfor/list /// /// /// @@ -44,7 +43,6 @@ namespace ZR.Admin.WebApi.Controllers.monitor /// /// 清空登录日志 - /// /monitor/logininfor/clean /// /// [Log(Title = "清空登录日志", BusinessType= BusinessType.CLEAN)] @@ -61,7 +59,6 @@ namespace ZR.Admin.WebApi.Controllers.monitor } /// - /// /monitor/logininfor/1 /// /// /// diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt index b2f9efc..51d5983 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -90,7 +90,6 @@ $if(replaceDto.ShowBtnAdd) { throw new CustomException("请求参数错误"); } - //从 Dto 映射到 实体 var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); var response = _${replaceDto.ModelTypeName}Service.Add${replaceDto.ModelTypeName}(modal); @@ -113,18 +112,9 @@ $if(replaceDto.ShowBtnEdit) { throw new CustomException("请求实体不能为空"); } - //从 Dto 映射到 实体 var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext); - var response = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == modal.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}() - { - //Update 字段映射 -$foreach(item in genTable.Columns) -$if((item.IsEdit)) - $item.CsharpField = modal.$item.CsharpField, -$end -${end} - }); + var response = _${replaceDto.ModelTypeName}Service.Update${replaceDto.ModelTypeName}(modal); return ToResponse(response); } diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt index a0c2451..f30aecd 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt @@ -20,5 +20,7 @@ $if(genTable.TplCategory == "tree") List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm); $end int Add${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm); + + int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm); } } diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt index 6b60ce3..ce428f3 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt @@ -106,6 +106,24 @@ ${foreach(item in genTable.Columns)} $if((item.IsInsert)) it.$item.CsharpField, $end +${end} + }); + return response; + } + + /// + /// 修改${genTable.FunctionName} + /// + /// + /// + public int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm) + { + var response = _${replaceDto.ModelTypeName}Repository.Update(w => w.${replaceDto.PKName} == parm.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}() + { +$foreach(item in genTable.Columns) +$if((item.IsEdit)) + $item.CsharpField = parm.$item.CsharpField, +$end ${end} }); return response; diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 0f0d985..8ec02cc 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -48,16 +48,17 @@ namespace ZR.CodeGenerator string PKName = "Id"; string PKType = "int"; - ReplaceDto replaceDto = new(); - replaceDto.ModelTypeName = dto.GenTable.ClassName;//表名对应C# 实体类名 - replaceDto.PermissionPrefix = dto.GenTable?.Options?.PermissionPrefix; - replaceDto.Author = dto.GenTable.FunctionAuthor; - replaceDto.ShowBtnAdd = dto.GenTable.Options.CheckedBtn.Any(f => f == 1); - replaceDto.ShowBtnEdit = dto.GenTable.Options.CheckedBtn.Any(f => f == 2); - replaceDto.ShowBtnDelete = dto.GenTable.Options.CheckedBtn.Any(f => f == 3); - replaceDto.ShowBtnExport = dto.GenTable.Options.CheckedBtn.Any(f => f == 4); - replaceDto.ShowBtnView = dto.GenTable.Options.CheckedBtn.Any(f => f == 5); - + ReplaceDto replaceDto = new() + { + ModelTypeName = dto.GenTable.ClassName,//表名对应C# 实体类名 + PermissionPrefix = dto.GenTable?.Options?.PermissionPrefix, + Author = dto.GenTable.FunctionAuthor, + ShowBtnAdd = dto.GenTable.Options.CheckedBtn.Any(f => f == 1), + ShowBtnEdit = dto.GenTable.Options.CheckedBtn.Any(f => f == 2), + ShowBtnDelete = dto.GenTable.Options.CheckedBtn.Any(f => f == 3), + ShowBtnExport = dto.GenTable.Options.CheckedBtn.Any(f => f == 4), + ShowBtnView = dto.GenTable.Options.CheckedBtn.Any(f => f == 5) + }; //循环表字段信息 foreach (GenTableColumn dbFieldInfo in dto.GenTable.Columns.OrderBy(x => x.Sort))