1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminMiddleLableController.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.Repository.Interface.Navigation;
+using GxPress.Request.Navigation;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -55,12 +56,12 @@ namespace GxPress.Api.AdminControllers
         /// <summary>
         /// 修改导航中间件
         /// </summary>
-        /// <param name="note"></param>
+        /// <param name="request"></param>
         /// <returns></returns>
         [HttpPut]
-        public async Task<bool> Update(Entity.Navigations.MiddleLable note)
+        public async Task<bool> Update(MiddleLableUpRequest request)
         {
-            return await middleLableRepository.UpdateAsync(note);
+            return await middleLableRepository.UpdateAsync(request);
         }
     }
 }

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminNavigationController.cs

@@ -23,12 +23,11 @@ namespace GxPress.Api.AdminControllers
 
         }
 
-
         /// <summary>
         /// 列表 pc 1 移动 2
         /// </summary>
         /// <returns></returns>
-        [HttpGet("terminal")]
+        [HttpGet("{terminal}")]
         public async Task<IEnumerable<Entity.Navigations.Navigation>> GetList(int terminal)
         {
             return await navigationRepository.GetAllAsync(terminal);
@@ -49,7 +48,7 @@ namespace GxPress.Api.AdminControllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPut]
-        public async Task<bool> Update(NavigationInRequest request)
+        public async Task<bool> Update(NavigationUpRequest request)
         {
             return await navigationRepository.UpdateAsync(request);
         }

gx_api/GxPress/Api/GxPress.Api/WebControllers/NavigationController.cs

@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace GxPress.Api.WebControllers
+{
+    /// <summary>
+    /// 导航数据
+    /// </summary>
+    [Route("api/web/navigation")]
+    [ApiController]
+    [Authorize]
+    public class NavigationController : Controller
+    {
+        
+    }
+}

gx_api/GxPress/Model/GxPress.Request/Navigation/MiddleLableRequest.cs

@@ -0,0 +1,42 @@
+namespace GxPress.Request.Navigation
+{
+    public class MiddleLableRequest
+    {
+
+    }
+    /// <summary>
+    /// 修改
+    /// </summary>
+    public class MiddleLableUpRequest
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 导航栏ID
+        /// </summary>
+        /// <value></value>
+
+        public string Name { get; set; }
+        /// <summary>
+        /// 标签ID
+        /// </summary>
+        /// <value></value>
+
+        public string LabelId { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <value></value>
+
+        public int Sort { get; set; }
+        /// <summary>
+        /// 是否禁用 1 设置 2取消
+        /// </summary>
+        /// <value></value>
+
+        public int IsDisable { get; set; }
+    }
+}

gx_api/GxPress/Model/GxPress.Request/Navigation/NavigationRequest.cs

@@ -7,7 +7,7 @@ namespace GxPress.Request.Navigation
     /// <summary>
     /// 添加
     /// </summary>
-    public class NavigationInRequest
+    public class NavigationUpRequest
     {
         /// <summary>
         /// ID

gx_api/GxPress/Repository/GxPress.Repository.Implement/Navigation/MiddleLableRepository.cs

@@ -6,11 +6,12 @@ using GxPress.Common.AppOptions;
 using GxPress.Common.Tools;
 using GxPress.Entity.Navigations;
 using GxPress.Repository.Interface.Navigation;
+using GxPress.Request.Navigation;
 using Microsoft.Extensions.Options;
 
 namespace GxPress.Repository.Implement.Navigation
 {
-    public class MiddleLableRepository :IMiddleLableRepository
+    public class MiddleLableRepository : IMiddleLableRepository
     {
         private readonly Repository<Entity.Navigations.MiddleLable> _repository;
         private readonly IMapper _mapper;
@@ -46,9 +47,22 @@ namespace GxPress.Repository.Implement.Navigation
             return await _repository.InsertAsync(note);
         }
 
-        public async Task<bool> UpdateAsync(Entity.Navigations.MiddleLable note)
+        public async Task<bool> UpdateAsync(MiddleLableUpRequest request)
         {
-            return await _repository.UpdateAsync(note);
+            if (request.Id > 0)
+            {
+                var model = await GetAsync(request.Id);
+                if (request.IsDisable > 0)
+                    model.IsDisable = request.IsDisable == 1;
+                if (!string.IsNullOrEmpty(request.LabelId))
+                    model.LabelId = request.LabelId;
+                if (!string.IsNullOrEmpty(request.Name))
+                    model.Name = request.Name;
+                if (request.Sort > 0)
+                    model.Sort = request.Sort;
+                return await _repository.UpdateAsync(model);
+            }
+            return false;
         }
         public async Task<bool> UpdateAsync(SqlKata.Query query)
         {

gx_api/GxPress/Repository/GxPress.Repository.Implement/Navigation/NavigationRepository.cs

@@ -46,7 +46,7 @@ namespace GxPress.Repository.Implement.Navigation
             return await _repository.InsertAsync(note);
         }
 
-        public async Task<bool> UpdateAsync(NavigationInRequest request)
+        public async Task<bool> UpdateAsync(NavigationUpRequest request)
         {
             if (request.Id > 0)
             {

gx_api/GxPress/Repository/GxPress.Repository.Interface/Navigation/IMiddleLableRepository.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Datory;
+using GxPress.Request.Navigation;
 
 namespace GxPress.Repository.Interface.Navigation
 {
@@ -11,7 +12,7 @@ namespace GxPress.Repository.Interface.Navigation
 
         Task<int> InsertAsync(Entity.Navigations.MiddleLable note);
 
-        Task<bool> UpdateAsync(Entity.Navigations.MiddleLable note);
+        Task<bool> UpdateAsync(MiddleLableUpRequest request);
         Task<bool> UpdateAsync(SqlKata.Query query);
 
         Task<IEnumerable<Entity.Navigations.MiddleLable>> GetAllAsync();

gx_api/GxPress/Repository/GxPress.Repository.Interface/Navigation/INavigationRepository.cs

@@ -13,7 +13,7 @@ namespace GxPress.Repository.Interface.Navigation
 
         Task<int> InsertAsync(Entity.Navigations.Navigation note);
 
-        Task<bool> UpdateAsync(NavigationInRequest request);
+        Task<bool> UpdateAsync(NavigationUpRequest request);
         Task<bool> UpdateAsync(SqlKata.Query query);
 
         Task<IEnumerable<Entity.Navigations.Navigation>> GetAllAsync(int terminal);