Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ codeFirst实体建表

Browse Source
This commit is contained in:
不做码农
2023-06-07 22:28:06 +08:00
parent 628df80df7
commit b96edfdac7
47 changed files with 688 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,16 +58,16 @@ namespace ZR.Admin.WebApi.Controllers.System
/// <summary>
/// 添加角色
/// </summary>
/// <param name="sysRoleDto"></param>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "system:role:add")]
[Log(Title = "角色管理", BusinessType = BusinessType.INSERT)]
[Route("edit")]
public IActionResult RoleAdd([FromBody] SysRole sysRoleDto)
public IActionResult RoleAdd([FromBody] SysRoleDto dto)
{
if (sysRoleDto == null) return ToResponse(ApiResult.Error(101, "请求参数错误"));
if (dto == null) return ToResponse(ApiResult.Error(101, "请求参数错误"));
SysRole sysRoleDto = dto.Adapt<SysRole>();
if (UserConstants.NOT_UNIQUE.Equals(sysRoleService.CheckRoleKeyUnique(sysRoleDto)))
{
return ToResponse(ApiResult.Error((int)ResultCode.CUSTOM_ERROR, $"新增角色'{sysRoleDto.RoleName}'失败，角色权限已存在"));
@@ -82,18 +82,19 @@ namespace ZR.Admin.WebApi.Controllers.System
/// <summary>
/// 修改角色
/// </summary>
/// <param name="sysRoleDto"></param>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "system:role:edit")]
[Log(Title = "角色管理", BusinessType = BusinessType.UPDATE)]
[Route("edit")]
public IActionResult RoleEdit([FromBody] SysRole sysRoleDto)
public IActionResult RoleEdit([FromBody] SysRoleDto dto)
{
if (sysRoleDto == null || sysRoleDto.RoleId <= 0 || string.IsNullOrEmpty(sysRoleDto.RoleKey))
if (dto == null || dto.RoleId <= 0 || string.IsNullOrEmpty(dto.RoleKey))
{
return ToResponse(ApiResult.Error(101, "请求参数错误"));
}
SysRole sysRoleDto = dto.Adapt<SysRole>();
sysRoleService.CheckRoleAllowed(sysRoleDto);
var info = sysRoleService.SelectRoleById(sysRoleDto.RoleId);
if (info != null && info.RoleKey != sysRoleDto.RoleKey)

5
ZR.Admin.WebApi/Controllers/System/SysUserController.cs
View File

@@ -9,6 +9,7 @@ using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model;
using ZR.Model.System;
using ZR.Model.System.Dto;
using ZR.Service.System.IService;
namespace ZR.Admin.WebApi.Controllers.System
@@ -44,7 +45,7 @@ namespace ZR.Admin.WebApi.Controllers.System
/// <returns></returns>
[ActionPermissionFilter(Permission = "system:user:list")]
[HttpGet("list")]
public IActionResult List([FromQuery] SysUser user, PagerInfo pager)
public IActionResult List([FromQuery] SysUserQueryDto user, PagerInfo pager)
{
var list = UserService.SelectUserList(user, pager);
@@ -208,7 +209,7 @@ namespace ZR.Admin.WebApi.Controllers.System
[HttpGet("export")]
[Log(Title = "用户导出", BusinessType = BusinessType.EXPORT)]
[ActionPermissionFilter(Permission = "system:user:export")]
public IActionResult UserExport([FromQuery] SysUser user)
public IActionResult UserExport([FromQuery] SysUserQueryDto user)
{
var list = UserService.SelectUserList(user, new PagerInfo(1, 10000));