11

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminNavigationController.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;
 
@@ -45,12 +46,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.Navigation note)
+        public async Task<bool> Update(NavigationInRequest request)
         {
-            return await navigationRepository.UpdateAsync(note);
+            return await navigationRepository.UpdateAsync(request);
         }
     }
 }

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

@@ -0,0 +1,61 @@
+namespace GxPress.Request.Navigation
+{
+    public class NavigationRequest
+    {
+
+    }
+    /// <summary>
+    /// 添加
+    /// </summary>
+    public class NavigationInRequest
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 导航名称
+        /// </summary>
+        /// <value></value>
+
+        public string Name { get; set; }
+        /// <summary>
+        /// 是否禁用 1设置2取消
+        /// </summary>
+        /// <value></value>
+
+        public int IsDisable { get; set; }
+        /// <summary>
+        /// 父级ID
+        /// </summary>
+        /// <value></value>
+
+        public int ParentId { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <value></value>
+
+        public int Sort { get; set; }
+        /// <summary>
+        /// 中间件页面ID
+        /// </summary>
+        /// <value></value>
+
+        public int MiddleLableId { get; set; }
+        /// <summary>
+        /// 是否可以操作 1设置2取消
+        /// </summary>
+        /// <value></value>
+
+        public int Isoperate { get; set; }
+        /// <summary>
+        /// 终端 1 pc 2 移动端
+        /// </summary>
+        /// <value></value>
+
+        public int Terminal { get; set; }
+    }
+}

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

@@ -5,6 +5,7 @@ using Datory;
 using GxPress.Common.AppOptions;
 using GxPress.Common.Tools;
 using GxPress.Repository.Interface.Navigation;
+using GxPress.Request.Navigation;
 using Microsoft.Extensions.Options;
 
 namespace GxPress.Repository.Implement.Navigation
@@ -45,9 +46,28 @@ namespace GxPress.Repository.Implement.Navigation
             return await _repository.InsertAsync(note);
         }
 
-        public async Task<bool> UpdateAsync(Entity.Navigations.Navigation note)
+        public async Task<bool> UpdateAsync(NavigationInRequest 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 (request.Isoperate > 0)
+                    model.Isoperate = request.Isoperate == 1;
+                if (request.MiddleLableId > 0)
+                    model.MiddleLableId = request.MiddleLableId;
+                if (!string.IsNullOrEmpty(request.Name))
+                    model.Name = request.Name;
+                if (request.ParentId > 0)
+                    model.ParentId = request.ParentId;
+                if (request.Sort > 0)
+                    model.Sort = request.Sort;
+                if (request.Terminal > 0)
+                    model.Terminal = request.Terminal;
+                return await _repository.UpdateAsync(model);
+            }
+            return false;
         }
         public async Task<bool> UpdateAsync(SqlKata.Query query)
         {

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

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