wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
不做码农 2022-06-09 21:15:30 +08:00
parent e209c4a192
commit 71bbc27b1e
15 changed files with 44 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs
View File

@ -104,12 +104,10 @@ namespace ZR.Admin.WebApi.Controllers
{ {
throw new CustomException("请求实体不能为空"); throw new CustomException("请求实体不能为空");
} }
//从 Dto 映射到 实体
var modal = parm.Adapt<ArticleCategory>().ToUpdate(HttpContext); var modal = parm.Adapt<ArticleCategory>().ToUpdate(HttpContext);
var response = _ArticleCategoryService.Update(w => w.CategoryId == modal.CategoryId, it => new ArticleCategory() var response = _ArticleCategoryService.Update(w => w.CategoryId == modal.CategoryId, it => new ArticleCategory()
{ {
//Update 字段映射
Name = modal.Name, Name = modal.Name,
ParentId = modal.ParentId, ParentId = modal.ParentId,
}); });

6
ZR.Admin.WebApi/Controllers/System/ArticleController.cs
View File

@ -40,10 +40,8 @@ namespace ZR.Admin.WebApi.Controllers
[ActionPermissionFilter(Permission = "system:article:list")] [ActionPermissionFilter(Permission = "system:article:list")]
public IActionResult Query([FromQuery] ArticleQueryDto parm) public IActionResult Query([FromQuery] ArticleQueryDto parm)
{ {
//开始拼装查询条件
var predicate = Expressionable.Create<Article>(); var predicate = Expressionable.Create<Article>();
//搜索条件
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Title), m => m.Title.Contains(parm.Title)); 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); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Status), m => m.Status == parm.Status);
@ -59,10 +57,7 @@ namespace ZR.Admin.WebApi.Controllers
[HttpGet("newList")] [HttpGet("newList")]
public IActionResult QueryNew() public IActionResult QueryNew()
{ {
//开始拼装查询条件
var predicate = Expressionable.Create<Article>(); var predicate = Expressionable.Create<Article>();
//搜索条件
predicate = predicate.And(m => m.Status == "1"); predicate = predicate.And(m => m.Status == "1");
var response = _ArticleService.Queryable() var response = _ArticleService.Queryable()
@ -99,7 +94,6 @@ namespace ZR.Admin.WebApi.Controllers
{ {
throw new CustomException("请求参数错误"); throw new CustomException("请求参数错误");
} }
//从 Dto 映射到 实体
var addModel = parm.Adapt<Article>().ToCreate(context: HttpContext); var addModel = parm.Adapt<Article>().ToCreate(context: HttpContext);
addModel.AuthorName = HttpContext.GetName(); addModel.AuthorName = HttpContext.GetName();

6
ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
View File

@ -41,10 +41,8 @@ namespace ZR.Admin.WebApi.Controllers
[ActionPermissionFilter(Permission = "system:config:list")] [ActionPermissionFilter(Permission = "system:config:list")]
public IActionResult QuerySysConfig([FromQuery] SysConfigQueryDto parm) public IActionResult QuerySysConfig([FromQuery] SysConfigQueryDto parm)
{ {
//开始拼装查询条件
var predicate = Expressionable.Create<SysConfig>(); var predicate = Expressionable.Create<SysConfig>();
//TODO 搜索条件
predicate = predicate.AndIF(!parm.ConfigType.IsEmpty(),m => m.ConfigType == parm.ConfigType); 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.ConfigName.IsEmpty(),m => m.ConfigName.Contains(parm.ConfigType));
predicate = predicate.AndIF(!parm.ConfigKey.IsEmpty(),m => m.ConfigKey.Contains(parm.ConfigKey)); predicate = predicate.AndIF(!parm.ConfigKey.IsEmpty(),m => m.ConfigKey.Contains(parm.ConfigKey));
@ -79,7 +77,6 @@ namespace ZR.Admin.WebApi.Controllers
[AllowAnonymous] [AllowAnonymous]
public IActionResult GetConfigKey(string configKey) public IActionResult GetConfigKey(string configKey)
{ {
//TODO 增加缓存
var response = _SysConfigService.Queryable().First(f=> f.ConfigKey == configKey); var response = _SysConfigService.Queryable().First(f=> f.ConfigKey == configKey);
return SUCCESS(response?.ConfigValue); return SUCCESS(response?.ConfigValue);
@ -98,7 +95,6 @@ namespace ZR.Admin.WebApi.Controllers
{ {
throw new CustomException("请求参数错误"); throw new CustomException("请求参数错误");
} }
//从 Dto 映射到 实体
var model = parm.Adapt<SysConfig>().ToCreate(HttpContext); var model = parm.Adapt<SysConfig>().ToCreate(HttpContext);
return SUCCESS(_SysConfigService.Insert(model, it => new return SUCCESS(_SysConfigService.Insert(model, it => new
@ -126,12 +122,10 @@ namespace ZR.Admin.WebApi.Controllers
{ {
throw new CustomException("请求实体不能为空"); throw new CustomException("请求实体不能为空");
} }
//从 Dto 映射到 实体
var model = parm.Adapt<SysConfig>().ToUpdate(HttpContext); var model = parm.Adapt<SysConfig>().ToUpdate(HttpContext);
var response = _SysConfigService.Update(w => w.ConfigId == model.ConfigId, it => new SysConfig() var response = _SysConfigService.Update(w => w.ConfigId == model.ConfigId, it => new SysConfig()
{ {
//Update 字段映射
ConfigName = model.ConfigName, ConfigName = model.ConfigName,
ConfigKey = model.ConfigKey, ConfigKey = model.ConfigKey,
ConfigValue = model.ConfigValue, ConfigValue = model.ConfigValue,

6
ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs
View File

@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Mvc;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters; using ZR.Admin.WebApi.Filters;
using ZR.Model; using ZR.Model;
using ZR.Model.System; using ZR.Model.System;
@ -54,6 +55,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{ {
return SUCCESS(SysDictDataService.SelectDictDataByType(dictType)); return SUCCESS(SysDictDataService.SelectDictDataByType(dictType));
} }
/// <summary> /// <summary>
/// 根据字典类型查询字典数据信息 /// 根据字典类型查询字典数据信息
/// </summary> /// </summary>
@ -101,7 +103,7 @@ namespace ZR.Admin.WebApi.Controllers.System
[HttpPost()] [HttpPost()]
public IActionResult Add([FromBody] SysDictData dict) public IActionResult Add([FromBody] SysDictData dict)
{ {
dict.Create_by = User.Identity.Name; dict.Create_by = HttpContext.GetName();
dict.Create_time = DateTime.Now; dict.Create_time = DateTime.Now;
return SUCCESS(SysDictDataService.InsertDictData(dict)); return SUCCESS(SysDictDataService.InsertDictData(dict));
} }
@ -116,7 +118,7 @@ namespace ZR.Admin.WebApi.Controllers.System
[HttpPut()] [HttpPut()]
public IActionResult Edit([FromBody] SysDictData dict) public IActionResult Edit([FromBody] SysDictData dict)
{ {
dict.Update_by = User.Identity.Name; dict.Update_by = HttpContext.GetName();
return SUCCESS(SysDictDataService.UpdateDictData(dict)); return SUCCESS(SysDictDataService.UpdateDictData(dict));
} }

3
ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs
View File

@ -67,8 +67,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{ {
return ToResponse(ApiResult.Error($"新增字典'{dict.DictName}'失败，字典类型已存在")); return ToResponse(ApiResult.Error($"新增字典'{dict.DictName}'失败，字典类型已存在"));
} }
//设置添加人 dict.Create_by = HttpContext.GetName();
dict.Create_by = HttpContext.User.Identity.Name;
dict.Create_time = DateTime.Now; dict.Create_time = DateTime.Now;
return SUCCESS(SysDictService.InsertDictType(dict)); return SUCCESS(SysDictService.InsertDictType(dict));
} }

8
ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs
View File

@ -44,10 +44,8 @@ namespace ZR.Admin.WebApi.Controllers.System
[HttpGet("queryNotice")] [HttpGet("queryNotice")]
public IActionResult QueryNotice([FromQuery] SysNoticeQueryDto parm) public IActionResult QueryNotice([FromQuery] SysNoticeQueryDto parm)
{ {
//开始拼装查询条件
var predicate = Expressionable.Create<SysNotice>(); var predicate = Expressionable.Create<SysNotice>();
//搜索条件查询语法参考Sqlsugar
predicate = predicate.And(m => m.Status == "0"); predicate = predicate.And(m => m.Status == "0");
var response = _SysNoticeService.GetPages(predicate.ToExpression(), parm); var response = _SysNoticeService.GetPages(predicate.ToExpression(), parm);
return SUCCESS(response); return SUCCESS(response);
@ -61,10 +59,8 @@ namespace ZR.Admin.WebApi.Controllers.System
[ActionPermissionFilter(Permission = "system:notice:list")] [ActionPermissionFilter(Permission = "system:notice:list")]
public IActionResult QuerySysNotice([FromQuery] SysNoticeQueryDto parm) public IActionResult QuerySysNotice([FromQuery] SysNoticeQueryDto parm)
{ {
//开始拼装查询条件
var predicate = Expressionable.Create<SysNotice>(); var predicate = Expressionable.Create<SysNotice>();
//搜索条件查询语法参考Sqlsugar
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeTitle), m => m.NoticeTitle.Contains(parm.NoticeTitle)); 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.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)); 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 映射到 实体 //从 Dto 映射到 实体
var modal = parm.Adapt<SysNotice>().ToCreate(HttpContext); var modal = parm.Adapt<SysNotice>().ToCreate(HttpContext);
modal.Create_by = User.Identity.Name; modal.Create_by = HttpContext.GetName();
modal.Create_time = DateTime.Now; modal.Create_time = DateTime.Now;
int result = _SysNoticeService.Insert(modal, it => new int result = _SysNoticeService.Insert(modal, it => new
@ -143,7 +139,7 @@ namespace ZR.Admin.WebApi.Controllers.System
NoticeContent = model.NoticeContent, NoticeContent = model.NoticeContent,
Status = model.Status, Status = model.Status,
Remark = model.Remark, Remark = model.Remark,
Update_by = User.Identity.Name, Update_by = HttpContext.GetName(),
Update_time = DateTime.Now Update_time = DateTime.Now
}); });

6
ZR.Admin.WebApi/Controllers/System/SysPostController.cs
View File

@ -10,6 +10,7 @@ using Infrastructure.Enums;
using Infrastructure; using Infrastructure;
using ZR.Service.System.IService; using ZR.Service.System.IService;
using ZR.Common; using ZR.Common;
using ZR.Admin.WebApi.Extensions;
namespace ZR.Admin.WebApi.Controllers.System namespace ZR.Admin.WebApi.Controllers.System
{ {
@ -34,7 +35,6 @@ namespace ZR.Admin.WebApi.Controllers.System
[ActionPermissionFilter(Permission = "system:post:list")] [ActionPermissionFilter(Permission = "system:post:list")]
public IActionResult List([FromQuery] SysPost post, [FromQuery] PagerInfo pagerInfo) public IActionResult List([FromQuery] SysPost post, [FromQuery] PagerInfo pagerInfo)
{ {
//开始拼装查询条件
var predicate = Expressionable.Create<SysPost>(); var predicate = Expressionable.Create<SysPost>();
predicate = predicate.AndIF(post.Status.IfNotEmpty(), it => it.Status == post.Status); predicate = predicate.AndIF(post.Status.IfNotEmpty(), it => it.Status == post.Status);
var list = PostService.GetPages(predicate.ToExpression(), pagerInfo, s => new { s.PostSort }); 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}失败，岗位编码已存在"); throw new CustomException($"修改岗位{post.PostName}失败，岗位编码已存在");
} }
post.Create_by = User.Identity.Name; post.Create_by = HttpContext.GetName();
return ToResponse(ToJson(PostService.Add(post))); return ToResponse(ToJson(PostService.Add(post)));
} }
@ -95,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{ {
throw new CustomException($"修改岗位{post.PostName}失败，岗位编码已存在"); throw new CustomException($"修改岗位{post.PostName}失败，岗位编码已存在");
} }
post.Update_by = User.Identity.Name; post.Update_by = HttpContext.GetName();
return ToResponse(PostService.Update(post)); return ToResponse(PostService.Update(post));
} }

1
ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
View File

@ -78,7 +78,6 @@ namespace ZR.Admin.WebApi.Controllers.System
{ {
throw new CustomException(ResultCode.PARAM_ERROR, "请求参数错误"); throw new CustomException(ResultCode.PARAM_ERROR, "请求参数错误");
} }
//从 Dto 映射到 实体
var user = userDto.Adapt<SysUser>().ToUpdate(HttpContext); var user = userDto.Adapt<SysUser>().ToUpdate(HttpContext);
int result = UserService.ChangeUser(user); int result = UserService.ChangeUser(user);

4
ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
View File

@ -71,7 +71,7 @@ namespace ZR.Admin.WebApi.Controllers.System
return ToResponse(ApiResult.Error((int)ResultCode.CUSTOM_ERROR, $"新增角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); 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); long roleId = sysRoleService.InsertRole(sysRoleDto);
return ToResponse(ToJson(roleId)); return ToResponse(ToJson(roleId));
@ -101,7 +101,7 @@ namespace ZR.Admin.WebApi.Controllers.System
return ToResponse(ApiResult.Error($"编辑角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); return ToResponse(ApiResult.Error($"编辑角色'{sysRoleDto.RoleName}'失败，角色权限已存在"));
} }
} }
sysRoleDto.Update_by = User.Identity.Name; sysRoleDto.Update_by = HttpContext.GetName();
int upResult = sysRoleService.UpdateRole(sysRoleDto); int upResult = sysRoleService.UpdateRole(sysRoleDto);
if (upResult > 0) if (upResult > 0)
{ {

1
ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
View File

@ -36,7 +36,6 @@ namespace ZR.Admin.WebApi.Controllers.System
[HttpGet("list")] [HttpGet("list")]
public IActionResult GetList([FromQuery] PagerInfo pager, [FromQuery] TasksLogQueryDto queryDto) public IActionResult GetList([FromQuery] PagerInfo pager, [FromQuery] TasksLogQueryDto queryDto)
{ {
//开始拼装查询条件
queryDto.BeginTime = DateTimeHelper.GetBeginTime(queryDto.BeginTime, -7); queryDto.BeginTime = DateTimeHelper.GetBeginTime(queryDto.BeginTime, -7);
queryDto.EndTime = DateTimeHelper.GetBeginTime(queryDto.EndTime, 7); queryDto.EndTime = DateTimeHelper.GetBeginTime(queryDto.EndTime, 7);

3
ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs
View File

@ -29,7 +29,6 @@ namespace ZR.Admin.WebApi.Controllers.monitor
/// <summary> /// <summary>
/// 查询登录日志 /// 查询登录日志
/// /monitor/logininfor/list
/// </summary> /// </summary>
/// <param name="sysLogininfoDto"></param> /// <param name="sysLogininfoDto"></param>
/// <param name="pagerInfo"></param> /// <param name="pagerInfo"></param>
@ -44,7 +43,6 @@ namespace ZR.Admin.WebApi.Controllers.monitor
/// <summary> /// <summary>
/// 清空登录日志 /// 清空登录日志
/// /monitor/logininfor/clean
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[Log(Title = "清空登录日志", BusinessType= BusinessType.CLEAN)] [Log(Title = "清空登录日志", BusinessType= BusinessType.CLEAN)]
@ -61,7 +59,6 @@ namespace ZR.Admin.WebApi.Controllers.monitor
} }
/// <summary> /// <summary>
/// /monitor/logininfor/1
/// </summary> /// </summary>
/// <param name="infoIds"></param> /// <param name="infoIds"></param>
/// <returns></returns> /// <returns></returns>

12
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
View File

@ -90,7 +90,6 @@ $if(replaceDto.ShowBtnAdd)
{ {
throw new CustomException("请求参数错误"); throw new CustomException("请求参数错误");
} }
//从 Dto 映射到 实体
var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext);
var response = _${replaceDto.ModelTypeName}Service.Add${replaceDto.ModelTypeName}(modal); var response = _${replaceDto.ModelTypeName}Service.Add${replaceDto.ModelTypeName}(modal);
@ -113,18 +112,9 @@ $if(replaceDto.ShowBtnEdit)
{ {
throw new CustomException("请求实体不能为空"); throw new CustomException("请求实体不能为空");
} }
//从 Dto 映射到 实体
var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext); 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}() var response = _${replaceDto.ModelTypeName}Service.Update${replaceDto.ModelTypeName}(modal);
{
//Update 字段映射
$foreach(item in genTable.Columns)
$if((item.IsEdit))
$item.CsharpField = modal.$item.CsharpField,
$end
${end}
});
return ToResponse(response); return ToResponse(response);
} }

2
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt
View File

@ -20,5 +20,7 @@ $if(genTable.TplCategory == "tree")
List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm); List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm);
$end $end
int Add${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm); int Add${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm);
int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm);
} }
} }

18
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
View File

@ -106,6 +106,24 @@ ${foreach(item in genTable.Columns)}
$if((item.IsInsert)) $if((item.IsInsert))
it.$item.CsharpField, it.$item.CsharpField,
$end $end
${end}
});
return response;
}
/// <summary>
/// 修改${genTable.FunctionName}
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
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} ${end}
}); });
return response; return response;

21
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -48,16 +48,17 @@ namespace ZR.CodeGenerator
string PKName = "Id"; string PKName = "Id";
string PKType = "int"; string PKType = "int";
ReplaceDto replaceDto = new(); ReplaceDto replaceDto = new()
replaceDto.ModelTypeName = dto.GenTable.ClassName;//表名对应C# 实体类名 {
replaceDto.PermissionPrefix = dto.GenTable?.Options?.PermissionPrefix; ModelTypeName = dto.GenTable.ClassName,//表名对应C# 实体类名
replaceDto.Author = dto.GenTable.FunctionAuthor; PermissionPrefix = dto.GenTable?.Options?.PermissionPrefix,
replaceDto.ShowBtnAdd = dto.GenTable.Options.CheckedBtn.Any(f => f == 1); Author = dto.GenTable.FunctionAuthor,
replaceDto.ShowBtnEdit = dto.GenTable.Options.CheckedBtn.Any(f => f == 2); ShowBtnAdd = dto.GenTable.Options.CheckedBtn.Any(f => f == 1),
replaceDto.ShowBtnDelete = dto.GenTable.Options.CheckedBtn.Any(f => f == 3); ShowBtnEdit = dto.GenTable.Options.CheckedBtn.Any(f => f == 2),
replaceDto.ShowBtnExport = dto.GenTable.Options.CheckedBtn.Any(f => f == 4); ShowBtnDelete = dto.GenTable.Options.CheckedBtn.Any(f => f == 3),
replaceDto.ShowBtnView = dto.GenTable.Options.CheckedBtn.Any(f => f == 5); 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)) foreach (GenTableColumn dbFieldInfo in dto.GenTable.Columns.OrderBy(x => x.Sort))