From c537d85565714895e5047225917ed9bf7d692762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com>
Date: Wed, 16 Jul 2025 08:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E8=8F=9C=E5=8D=95uu?=
 =?UTF-8?q?id=E7=9A=84=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=EF=BC=9B?=
 =?UTF-8?q?=E9=80=92=E5=BD=92=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=88=E6=94=B9=E5=8F=98=E7=88=B6id=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=B8=A6=E5=8A=A8=E7=9B=AE=E5=BD=95=E4=B8=8B=E7=9A=84=E5=AD=90?=
 =?UTF-8?q?=E9=A1=B9=E8=8F=9C=E5=8D=95=E4=B8=80=E8=B5=B7=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AGSS/Controllers/Menu/MenuController.cs | 10 +++++-----
 AGSS/Models/DTOs/MenuDto.cs             | 24 +++++++++++++++++++++++-
 AGSS/Services/MenuService.cs            |  7 ++++---
 3 files changed, 32 insertions(+), 9 deletions(-)

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
     /// 新增父级菜单
     /// </summary>
     [HttpPost("createParent")]
-    public async Task<ReturnTemplate> CreateParentMenu([FromBody] MenuRequest request)
+    public async Task<ReturnTemplate> CreateParentMenu([FromBody] MenuInitialRequest request)
     {
         return await _menuService.CreateParentMenu(request);
     }
@@ -29,7 +29,7 @@ public class MenuController : ControllerBase
     /// 编辑父级菜单
     /// </summary>
     [HttpPut("updateParent")]
-    public async Task<ReturnTemplate> UpdateParentMenu([FromBody] MenuRequest request)
+    public async Task<ReturnTemplate> UpdateParentMenu([FromBody] MenuUpdateRequest request)
     {
         return await _menuService.UpdateParentMenu(request);
     }
@@ -47,13 +47,13 @@ public class MenuController : ControllerBase
     /// 编辑子级菜单
     /// </summary>
     [HttpPut("updateChild")]
-    public async Task<ReturnTemplate> UpdateChildMenu([FromBody] MenuRequest request)
+    public async Task<ReturnTemplate> UpdateChildMenu([FromBody] MenuUpdateRequestSon request)
     {
         return await _menuService.UpdateChildMenu(request);
     }
 
     /// <summary>
-    /// 查询菜单全量返回（树形结构）
+    /// 查询菜单全量返回
     /// </summary>
     [HttpGet("all")]
     public async Task<ReturnTemplate> GetAllMenus()
@@ -62,7 +62,7 @@ public class MenuController : ControllerBase
     }
 
     /// <summary>
-    /// 删除菜单（递归删除）
+    /// 删除菜单
     /// </summary>
     [HttpDelete("delete/{uuid}")]
     public async Task<ReturnTemplate> 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
     /// <summary>
     /// 新增父级菜单
     /// </summary>
-    public async Task<ReturnTemplate> CreateParentMenu(MenuRequest request)
+    public async Task<ReturnTemplate> CreateParentMenu(MenuInitialRequest request)
     {
         try
         {
@@ -52,7 +52,7 @@ public class MenuService
     /// <summary>
     /// 编辑父级菜单
     /// </summary>
-    public async Task<ReturnTemplate> UpdateParentMenu(MenuRequest request)
+    public async Task<ReturnTemplate> UpdateParentMenu(MenuUpdateRequest request)
     {
         try
         {
@@ -143,7 +143,7 @@ public class MenuService
     /// <summary>
     /// 编辑子级菜单
     /// </summary>
-    public async Task<ReturnTemplate> UpdateChildMenu(MenuRequest request)
+    public async Task<ReturnTemplate> 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;