优化代码注释
This commit is contained in:
commit
39b51f3979
@ -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,
|
||||||
});
|
});
|
||||||
|
|||||||
@ -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();
|
||||||
|
|
||||||
|
|||||||
@ -42,10 +42,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));
|
||||||
@ -80,7 +78,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);
|
||||||
@ -99,7 +96,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
|
||||||
@ -127,12 +123,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,
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
using Infrastructure.Enums;
|
using Infrastructure.Enums;
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
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;
|
||||||
@ -51,6 +52,7 @@ namespace ZR.Admin.WebApi.Controllers.System
|
|||||||
{
|
{
|
||||||
return SUCCESS(SysDictDataService.SelectDictDataByType(dictType));
|
return SUCCESS(SysDictDataService.SelectDictDataByType(dictType));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 根据字典类型查询字典数据信息
|
/// 根据字典类型查询字典数据信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -98,7 +100,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));
|
||||||
}
|
}
|
||||||
@ -113,7 +115,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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -66,8 +66,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));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -43,10 +43,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);
|
||||||
@ -60,10 +58,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));
|
||||||
@ -142,7 +138,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
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -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);
|
||||||
|
|||||||
@ -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)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -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);
|
||||||
|
|
||||||
|
|||||||
@ -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>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user