diff --git a/AGSS/Controllers/Menu/MenuController.cs b/AGSS/Controllers/Menu/MenuController.cs index 561ea4b..c566093 100644 --- a/AGSS/Controllers/Menu/MenuController.cs +++ b/AGSS/Controllers/Menu/MenuController.cs @@ -20,7 +20,7 @@ public class MenuController : ControllerBase /// 新增父级菜单 /// [HttpPost("createParent")] - public async Task CreateParentMenu([FromBody] MenuRequest request) + public async Task CreateParentMenu([FromBody] MenuInitialRequest request) { return await _menuService.CreateParentMenu(request); } @@ -29,7 +29,7 @@ public class MenuController : ControllerBase /// 编辑父级菜单 /// [HttpPut("updateParent")] - public async Task UpdateParentMenu([FromBody] MenuRequest request) + public async Task UpdateParentMenu([FromBody] MenuUpdateRequest request) { return await _menuService.UpdateParentMenu(request); } @@ -47,13 +47,13 @@ public class MenuController : ControllerBase /// 编辑子级菜单 /// [HttpPut("updateChild")] - public async Task UpdateChildMenu([FromBody] MenuRequest request) + public async Task UpdateChildMenu([FromBody] MenuUpdateRequestSon request) { return await _menuService.UpdateChildMenu(request); } /// - /// 查询菜单全量返回(树形结构) + /// 查询菜单全量返回 /// [HttpGet("all")] public async Task GetAllMenus() @@ -62,7 +62,7 @@ public class MenuController : ControllerBase } /// - /// 删除菜单(递归删除) + /// 删除菜单 /// [HttpDelete("delete/{uuid}")] public async Task DeleteMenu(string uuid) diff --git a/AGSS/Models/DTOs/MenuDto.cs b/AGSS/Models/DTOs/MenuDto.cs index d6facb0..1147b9d 100644 --- a/AGSS/Models/DTOs/MenuDto.cs +++ b/AGSS/Models/DTOs/MenuDto.cs @@ -1,8 +1,21 @@ namespace AGSS.Models.DTOs; + +public class MenuInitialRequest +{ + public string Path { get; set; } = string.Empty; + public string Label { get; set; } = string.Empty; + public string Icon { get; set; } = string.Empty; + public string? MenuCode { get; set; } + public string Adaptability { get; set; } = "pc"; + public string Component { get; set; } = string.Empty; + public int Sort { get; set; } + public string Status { get; set; } = "1"; + public string? Query { get; set; } +} + public class MenuRequest { - public string? Uuid { get; set; } public string? ParentId { get; set; } public string Path { get; set; } = string.Empty; public string Label { get; set; } = string.Empty; @@ -15,6 +28,15 @@ public class MenuRequest public string? Query { get; set; } } +public class MenuUpdateRequest : MenuInitialRequest +{ + public string Uuid { get; set; } = string.Empty; +} + +public class MenuUpdateRequestSon : MenuRequest +{ + public string Uuid { get; set; } = string.Empty; +} public class MenuResponse { public string Uuid { get; set; } = string.Empty; diff --git a/AGSS/Services/MenuService.cs b/AGSS/Services/MenuService.cs index 03d77e3..0307654 100644 --- a/AGSS/Services/MenuService.cs +++ b/AGSS/Services/MenuService.cs @@ -18,7 +18,7 @@ public class MenuService /// /// 新增父级菜单 /// - public async Task CreateParentMenu(MenuRequest request) + public async Task CreateParentMenu(MenuInitialRequest request) { try { @@ -52,7 +52,7 @@ public class MenuService /// /// 编辑父级菜单 /// - public async Task UpdateParentMenu(MenuRequest request) + public async Task UpdateParentMenu(MenuUpdateRequest request) { try { @@ -143,7 +143,7 @@ public class MenuService /// /// 编辑子级菜单 /// - public async Task UpdateChildMenu(MenuRequest request) + public async Task UpdateChildMenu(MenuUpdateRequestSon request) { try { @@ -164,6 +164,7 @@ public class MenuService return new ReturnTemplate(400, "只能编辑子级菜单", null); } + menu.ParentId = request.ParentId; menu.Path = request.Path; menu.Label = request.Label; menu.Icon = request.Icon;