1

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

@@ -26,7 +26,7 @@ namespace GxPress.Api.WebControllers
         /// <returns></returns>
         [HttpGet("media/{id}")]
         [AllowAnonymous]
-        public async Task<List<NavigationMediaResult>> GetNavigationResults(int id)
+        public async Task<MiddleLableResult> GetNavigationResults(int id)
         {
             return await navigationRepository.GetNavigationResults(id);
         }

gx_api/GxPress/Model/GxPress.Mappings/MiddleLableMapping.cs

@@ -0,0 +1,15 @@
+using AutoMapper;
+using GxPress.Entity.Navigations;
+using GxPress.Result.Navigation;
+
+namespace GxPress.Mappings
+{
+    public class MiddleLableMapping : Profile
+    {
+        public MiddleLableMapping()
+        {
+            CreateMap<MiddleLable, MiddleLableResult>();
+        }
+
+    }
+}

gx_api/GxPress/Model/GxPress.Result/Navigation/NavigationResult.cs

@@ -24,6 +24,8 @@ namespace GxPress.Result.Navigation
         /// <value></value>
 
         public string LabelNameDescribe { get; set; }
+
+
         /// <summary>
         /// 备注
         /// </summary>
@@ -81,11 +83,66 @@ namespace GxPress.Result.Navigation
         /// </summary>
         /// <value></value>
         public List<MediaResult> MediaResults { get; set; }
-        // /// <summary>
-        // /// 获取轮播
-        // /// </summary>
-        // /// <value></value>
-        // public List<Entity.Slide> Sildes{get;set;}
+
+    }
+    /// <summary>
+    /// 中间页面
+    /// </summary>
+    public class MiddleLableResult
+    {
+        /// <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>
+        /// 是否禁用
+        /// </summary>
+        /// <value></value>
+
+        public bool IsDisable { get; set; }
+        /// <summary>
+        /// 是否开启搜索
+        /// </summary>
+        /// <value></value>
+
+        public bool IsSearch { get; set; }
+        /// <summary>
+        /// 是否开启轮播
+        /// </summary>
+        /// <value></value>
+
+        public bool IsSlide { get; set; }
+        /// <summary>
+        /// 1 APP 2 首页频道  3首页精选
+        /// </summary>
+        /// <value></value>
+
+        public int TypeId { get; set; }
+        /// <summary>
+        /// 导航数据的显示
+        /// </summary>
+        /// <value></value>
+        public List<NavigationMediaResult> NavigationMediaResults { get; set; }
+
+        /// <summary>
+        /// 获取轮播
+        /// </summary>
+        /// <value></value>
+        public List<Entity.Slide> Sildes { get; set; }
     }
     /// <summary>
     /// 导航数据的显示

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

@@ -23,6 +23,7 @@ namespace GxPress.Repository.Implement.Navigation
         private readonly Repository<Entity.SystemLabel.SystemLabel> _systemLabelRepository;
         private readonly Repository<Entity.tede2.Media.Media> _mediaRepository;
         private readonly Repository<Entity.tede2.Media.MediaLable> _mediaLableRepository;
+        private readonly Repository<Entity.Slide> slideRepository;
         public NavigationRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper)
         {
             _databaseTypestr = dbOptionsAccessor.CurrentValue.DatabaseType;
@@ -35,6 +36,7 @@ namespace GxPress.Repository.Implement.Navigation
             _systemLabelRepository = new Repository<Entity.SystemLabel.SystemLabel>(database);
             _mediaRepository = new Repository<Entity.tede2.Media.Media>(database);
             _mediaLableRepository = new Repository<Entity.tede2.Media.MediaLable>(database);
+            slideRepository = new Repository<Entity.Slide>(database);
             _mapper = mapper;
         }
 
@@ -146,9 +148,9 @@ namespace GxPress.Repository.Implement.Navigation
         /// 获取导航栏数据
         /// </summary>
         /// <returns></returns>
-        public async Task<List<NavigationMediaResult>> GetNavigationResults(int navigationId)
+        public async Task<MiddleLableResult> GetNavigationResults(int navigationId)
         {
-            var result = new List<NavigationMediaResult>();
+            var result = new MiddleLableResult();
             var navigation = await GetAsync(navigationId);
             if (navigation.MiddleLableId > 0)
             {
@@ -156,10 +158,16 @@ namespace GxPress.Repository.Implement.Navigation
                 var middleLable = await _middleLableRepository.GetAsync(navigation.MiddleLableId);
                 if (string.IsNullOrEmpty(middleLable.LabelId))
                     return result;
+                result = _mapper.Map<MiddleLableResult>(middleLable);
+                result.NavigationMediaResults = new List<NavigationMediaResult>();
                 //获取轮播
                 if (middleLable.IsSlide)
                 {
-                    //result
+                    if (result.IsSlide)
+                    {
+                        result.Sildes = await slideRepository.GetAllAsync(Q.Where(nameof(Entity.Slide.TypeId), result.TypeId).Where(nameof(Entity.Slide.IsDisable), false).OrderByDesc(nameof(Entity.Slide.Sort)));
+                    }
+
                 }
                 //获取标签
                 var systemLabels = await _systemLabelRepository.GetAllAsync(Q.WhereIn(nameof(Entity.SystemLabel.SystemLabel.Id), StringUtils.StringCollectionToIntList(middleLable.LabelId)));
@@ -195,7 +203,7 @@ namespace GxPress.Repository.Implement.Navigation
                     {
                         itemMedia.ImageUrls = StringUtils.AddDomain(itemMedia.ImageUrls);
                     }
-                    result.Add(navigationMediaResult);
+                    result.NavigationMediaResults.Add(navigationMediaResult);
                 }
             }
             return result;

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

@@ -22,6 +22,6 @@ namespace GxPress.Repository.Interface.Navigation
         /// 获取导航栏数据
         /// </summary>
         /// <returns></returns>
-        Task<List<NavigationMediaResult>> GetNavigationResults(int navigationId);
+        Task<MiddleLableResult> GetNavigationResults(int navigationId);
     }
 }