1

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

@@ -63,5 +63,6 @@ namespace GxPress.Api.AdminControllers
         {
             return await navigationRepository.DeleteAsync(id);
         }
+       
     }
 }

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

@@ -1,3 +1,7 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GxPress.Repository.Interface.Navigation;
+using GxPress.Result.Navigation;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -11,6 +15,19 @@ namespace GxPress.Api.WebControllers
     [Authorize]
     public class NavigationController : Controller
     {
-        
+        private readonly INavigationRepository navigationRepository;
+        public NavigationController(INavigationRepository navigationRepository)
+        {
+            this.navigationRepository = navigationRepository;
+        }
+        /// <summary>
+        /// 获取导航栏数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("{id}")]
+        public async Task<List<NavigationMediaResult>> GetNavigationResults(int id)
+        {
+            return await navigationRepository.GetNavigationResults(id);
+        }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/Media/MediaRepository.cs

@@ -299,6 +299,7 @@ namespace GxPress.Repository.Implement.Media
                         foreach (var item in result.MediaLibraryResults)
                         {
                             var mediaLibrary = _mapper.Map<Entity.tede2.Media.MediaLibrary>(item);
+                            mediaLibrary.MediaId = result.Id;
                             await mediaLibraryRepository.InsertAsync(mediaLibrary);
                         }
                     }
@@ -310,6 +311,7 @@ namespace GxPress.Repository.Implement.Media
                         foreach (var item in result.MediaLableResults)
                         {
                             var mediaLable = _mapper.Map<Entity.tede2.Media.MediaLable>(item);
+                            mediaLable.MediaId = result.Id;
                             await mediaLableRepository.InsertAsync(mediaLable);
                         }
                     }

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

@@ -7,6 +7,7 @@ using GxPress.Common.AppOptions;
 using GxPress.Common.Tools;
 using GxPress.Repository.Interface.Navigation;
 using GxPress.Request.Navigation;
+using GxPress.Result.Media;
 using GxPress.Result.Navigation;
 using Microsoft.Extensions.Options;
 
@@ -53,7 +54,11 @@ namespace GxPress.Repository.Implement.Navigation
         {
             return await _repository.InsertAsync(note);
         }
-
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
         public async Task<bool> UpdateAsync(NavigationUpRequest request)
         {
             if (request.Id > 0)
@@ -139,7 +144,7 @@ namespace GxPress.Repository.Implement.Navigation
         {
             var result = new List<NavigationMediaResult>();
             var navigation = await GetAsync(navigationId);
-            if (navigation.Terminal > 0)
+            if (navigation.MiddleLableId > 0)
             {
                 //获取中间页面
                 var middleLable = await _middleLableRepository.GetAsync(navigation.MiddleLableId);
@@ -151,6 +156,7 @@ namespace GxPress.Repository.Implement.Navigation
                 {
                     var navigationMediaResult = new NavigationMediaResult()
                     {
+                        Id = item.Id,
                         Sort = item.Sort,
                         StyleType = item.StyleType,
                         ActionUrl = item.ActionUrl,
@@ -161,12 +167,21 @@ namespace GxPress.Repository.Implement.Navigation
                         ResourceType = item.ResourceType
                     };
                     //获取媒体
-
+                    var query = Q.NewQuery();
+                    query.Where(nameof(Entity.tede2.Media.Media.LableId), item.Id);
+                    query.Where(nameof(Entity.tede2.Media.Media.IsChecked), true);
+                    query.Where(nameof(Entity.tede2.Media.Media.IsDelete), false);
+                    query.OrderByDesc(nameof(Entity.tede2.Media.Media.IsTop));
+                    query.OrderByDesc(nameof(Entity.tede2.Media.Media.IsRecommend));
+                    query.ForPage(1, 10);
+                    var medias = await _mediaRepository.GetAllAsync(query);
+                    navigationMediaResult.MediaResults = medias.Select(n => _mapper.Map<MediaResult>(n)).ToList();
+                    result.Add(navigationMediaResult);
                 }
             }
             return result;
         }
 
-     
+
     }
 }