diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index 60fa3dc0..088c6d29 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -142,6 +142,32 @@ + + + Json To Sql 类比模式，通用模型 + + + + + + 主键查询 + + + + + + + 全部列表查询 + + + + + + 列表删除 + + + + 动态条件分页查询 @@ -255,20 +281,14 @@ - - - 通过角色id来获取菜单列表 - - - - + 添加角色包含菜单 - + 更新角色信息 @@ -360,13 +380,6 @@ - - - 添加用户，去重，密码加密 - - - - 给多用户设置多角色 @@ -378,18 +391,28 @@ 通过用户id得到用户信息关联部门、岗位、角色 + - + 更新用户信息 + - + 添加用户 + + + + + + 重置密码 + + diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleRdController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleRdController.cs new file mode 100644 index 00000000..3c0c2a32 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleRdController.cs @@ -0,0 +1,67 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Localization; +using Yi.Framework.Common.Helper; +using Yi.Framework.Common.Models; +using Yi.Framework.Interface; +using Yi.Framework.Language; +using Yi.Framework.Model.Models; +using Yi.Framework.Model.Query; +using Yi.Framework.Repository; +using Yi.Framework.WebCore.AttributeExtend; + +namespace Yi.Framework.ApiMicroservice.Controllers +{ + /// + /// Json To Sql 类比模式，通用模型 + /// + /// + [ApiController] + public class BaseSimpleRdController : ControllerBase where T : class, new() + { + private readonly ILogger _logger; + private IBaseService _baseService; + private IRepository _repository; + public BaseSimpleRdController(ILogger logger, IBaseService iBaseService) + { + _logger = logger; + _baseService = iBaseService; + _repository = iBaseService._repository; + } + + /// + /// 主键查询 + /// + /// + /// + [Permission($"{nameof(T)}:get")] + [Route("{id}")] + [HttpGet] + public virtual async Task GetById([FromRoute]long id) + { + return Result.Success().SetData(await _repository.GetByIdAsync(id)); + } + + /// + /// 全部列表查询 + /// + /// + [Permission($"{nameof(T)}:get")] + [HttpGet] + public virtual async Task GetList() + { + return Result.Success().SetData(await _repository.GetListAsync()); + } + + /// + /// 列表删除 + /// + /// + /// + [Permission($"{nameof(T)}:del")] + [HttpDelete] + public virtual async Task DelList(List ids) + { + return Result.Success().SetStatus(await _repository.DeleteByIdsAsync(ids.ToDynamicArray())); + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs index 2998a260..02e49d05 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs @@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// [ApiController] [Route("api/[controller]/[action]")] - public class RoleController : BaseSimpleCrudController + public class RoleController : BaseSimpleRdController { private IRoleService _iRoleService; public RoleController(ILogger logger, IRoleService iRoleService) : base(logger, iRoleService) @@ -52,15 +52,6 @@ namespace Yi.Framework.ApiMicroservice.Controllers return Result.Success().SetStatus(await _iRoleService.GiveRoleSetMenu(giveRoleSetMenuDto.RoleIds, giveRoleSetMenuDto.MenuIds)); } - /// - /// 通过角色id来获取菜单列表 - /// - /// - [HttpGet] - public async Task GetInMenuByRoleId(long RoleId) - { - return Result.Success().SetData(await _iRoleService.GetInMenuByRoleId(RoleId)); - } /// /// 添加角色包含菜单 @@ -69,7 +60,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// [HttpPost] - public async Task AddInfo(RoleInfoDto roleDto) + public async Task Add(RoleInfoDto roleDto) { return Result.Success().SetData(await _iRoleService.AddInfo(roleDto)); } @@ -79,7 +70,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// /// [HttpPut] - public async Task UpdateInfo(RoleInfoDto roleDto) + public async Task Update(RoleInfoDto roleDto) { return Result.Success().SetStatus(await _iRoleService.UpdateInfo(roleDto)); } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs index 86bf7b0b..9ea93ca1 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs @@ -21,7 +21,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// [ApiController] [Route("api/[controller]/[action]")] - public class UserController : BaseSimpleCrudController + public class UserController : BaseSimpleRdController { private IUserService _iUserService; public UserController(ILogger logger, IUserService iUserService) : base(logger, iUserService) @@ -55,22 +55,22 @@ namespace Yi.Framework.ApiMicroservice.Controllers } - /// - /// 添加用户，去重，密码加密 - /// - /// - /// - [Permission($"{nameof(UserEntity)}:add")] - [HttpPost] - public override async Task Add(UserEntity entity) - { - if (!await _iUserService.Exist(entity.UserName)) - { - entity.BuildPassword(); - return Result.Success().SetData(await _iUserService._repository.InsertReturnSnowflakeIdAsync(entity)); - } - return Result.SuccessError("用户已存在"); - } + ///// + ///// 添加用户，去重，密码加密 + ///// + ///// + ///// + //[Permission($"{nameof(UserEntity)}:add")] + //[HttpPost] + //public async Task Add(UserEntity entity) + //{ + // if (!await _iUserService.Exist(entity.UserName)) + // { + // entity.BuildPassword(); + // return Result.Success().SetData(await _iUserService._repository.InsertReturnSnowflakeIdAsync(entity)); + // } + // return Result.SuccessError("用户已存在"); + //} /// /// 给多用户设置多角色 @@ -87,21 +87,22 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// /// 通过用户id得到用户信息关联部门、岗位、角色 /// + /// /// [HttpGet] [Route("{id}")] - public override async Task GetById(long id) + public override async Task GetById([FromRoute] long id) { return Result.Success().SetData(await _iUserService.GetInfoById(id)); } - /// /// 更新用户信息 /// + /// /// [HttpPut] - public async Task UpdateInfo(UserInfoDto userDto) + public async Task Update(UserInfoDto userDto) { return Result.Success().SetStatus(await _iUserService.UpdateInfo(userDto)); } @@ -109,13 +110,19 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// /// 添加用户 /// + /// /// [HttpPost] - public async Task AddInfo(UserInfoDto userDto) + public async Task Add(UserInfoDto userDto) { return Result.Success().SetStatus(await _iUserService.AddInfo(userDto)); } + /// + /// 重置密码 + /// + /// + /// [HttpPut] public async Task RestPassword(UserEntity user) { 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 e3c17b1a..a200c92d 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Vue3.X.RuoYi/src/api/system/role.js b/Yi.Vue3.X.RuoYi/src/api/system/role.js index ae522368..65267251 100644 --- a/Yi.Vue3.X.RuoYi/src/api/system/role.js +++ b/Yi.Vue3.X.RuoYi/src/api/system/role.js @@ -22,7 +22,7 @@ export function getRole(roleId) { // 新增角色 export function addRole(data) { return request({ - url: '/role/addInfo', + url: '/role/add', method: 'post', data: data }) @@ -31,7 +31,7 @@ export function addRole(data) { // 修改角色 export function updateRole(data) { return request({ - url: '/role/updateInfo', + url: '/role/update', method: 'put', data: data }) diff --git a/Yi.Vue3.X.RuoYi/src/api/system/user.js b/Yi.Vue3.X.RuoYi/src/api/system/user.js index 39a58f45..d7588541 100644 --- a/Yi.Vue3.X.RuoYi/src/api/system/user.js +++ b/Yi.Vue3.X.RuoYi/src/api/system/user.js @@ -21,7 +21,7 @@ export function getUser(userId) { // 新增用户 export function addUser(data) { return request({ - url: '/user/addInfo', + url: '/user/add', method: 'post', data: data }) @@ -30,7 +30,7 @@ export function addUser(data) { // 修改用户 export function updateUser(data) { return request({ - url: '/user/updateInfo', + url: '/user/update', method: 'put', data: data })