1

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

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.Repository.Interface.Navigation;
 using GxPress.Request.Navigation;
+using GxPress.Result.Navigation;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -28,7 +29,7 @@ namespace GxPress.Api.AdminControllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("{terminal}")]
-        public async Task<IEnumerable<Entity.Navigations.Navigation>> GetList(int terminal)
+        public async Task<IEnumerable<NavigationResult>> GetList(int terminal)
         {
             return await navigationRepository.GetAllAsync(terminal);
         }

gx_api/GxPress/Model/GxPress.Mappings/NavigationMapping.cs

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

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

@@ -0,0 +1,151 @@
+using System.Collections.Generic;
+using GxPress.Result.Media;
+
+namespace GxPress.Result.Navigation
+{
+    /// <summary>
+    /// 导航数据的显示
+    /// </summary>
+    public class NavigationMediaResult
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 标签名称
+        /// </summary>
+        /// <value></value>
+        public string LabelName { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <value></value>
+
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 是否跳转
+        /// </summary>
+        /// <value></value>
+
+        public bool IsSkip { get; set; }
+
+        /// <summary>
+        /// 是否分页
+        /// </summary>
+        /// <value></value>
+
+        public bool IsPage { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        /// <value></value>
+
+        public string ControllerUrl { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        /// <value></value>
+
+        public string ActionUrl { get; set; }
+        /// <summary>
+        /// 资源类型
+        /// </summary>
+        /// <value></value>
+
+        public int ResourceType { get; set; }
+
+        /// <summary>
+        /// 样式类型
+        /// </summary>
+        /// <value></value>
+
+        public string StyleType { get; set; }
+        /// <summary>
+        /// 媒体
+        /// </summary>
+        /// <value></value>
+        public List<MediaResult> MediaResults { get; set; }
+    }
+    /// <summary>
+    /// 导航数据的显示
+    /// </summary>
+    public class NavigationResult
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 标签名称
+        /// </summary>
+        /// <value></value>
+        public string LabelName { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <value></value>
+
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 是否跳转
+        /// </summary>
+        /// <value></value>
+
+        public bool IsSkip { get; set; }
+
+        /// <summary>
+        /// 是否分页
+        /// </summary>
+        /// <value></value>
+
+        public bool IsPage { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        /// <value></value>
+
+        public string ControllerUrl { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        /// <value></value>
+
+        public string ActionUrl { get; set; }
+        /// <summary>
+        /// 资源类型
+        /// </summary>
+        /// <value></value>
+
+        public int ResourceType { get; set; }
+
+        /// <summary>
+        /// 样式类型
+        /// </summary>
+        /// <value></value>
+
+        public string StyleType { get; set; }
+        /// <summary>
+        /// 是否禁用
+        /// </summary>
+        /// <value></value>
+        public bool IsDisable { get; set; }
+        /// <summary>
+        /// 是否存在子集
+        /// </summary>
+        /// <value></value>
+        public bool IsChildren { get; set; }
+        /// <summary>
+        /// 子集
+        /// </summary>
+        /// <value></value>
+        public List<NavigationResult> Children { get; set; }
+
+    }
+}

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using Datory;
@@ -6,6 +7,7 @@ using GxPress.Common.AppOptions;
 using GxPress.Common.Tools;
 using GxPress.Repository.Interface.Navigation;
 using GxPress.Request.Navigation;
+using GxPress.Result.Navigation;
 using Microsoft.Extensions.Options;
 
 namespace GxPress.Repository.Implement.Navigation
@@ -16,6 +18,9 @@ namespace GxPress.Repository.Implement.Navigation
         private readonly IMapper _mapper;
         private readonly string _connectionString;
         private readonly string _databaseTypestr;
+        private readonly Repository<Entity.Navigations.MiddleLable> _middleLableRepository;
+        private readonly Repository<Entity.SystemLabel.SystemLabel> _systemLabelRepository;
+        private readonly Repository<Entity.tede2.Media.Media> _mediaRepository;
         public NavigationRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper)
         {
             _databaseTypestr = dbOptionsAccessor.CurrentValue.DatabaseType;
@@ -24,6 +29,9 @@ namespace GxPress.Repository.Implement.Navigation
                 StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
             var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
             _repository = new Repository<Entity.Navigations.Navigation>(database);
+            _middleLableRepository = new Repository<Entity.Navigations.MiddleLable>(database);
+            _systemLabelRepository = new Repository<Entity.SystemLabel.SystemLabel>(database);
+            _mediaRepository = new Repository<Entity.tede2.Media.Media>(database);
             _mapper = mapper;
         }
 
@@ -78,14 +86,85 @@ namespace GxPress.Repository.Implement.Navigation
         /// </summary>
         /// <param name="terminal"></param>
         /// <returns></returns>
-        public async Task<IEnumerable<Entity.Navigations.Navigation>> GetAllAsync(int terminal)
+        public async Task<IEnumerable<NavigationResult>> GetAllAsync(int terminal)
         {
             var query = Q.NewQuery();
             if (terminal > 0)
                 query.Where(nameof(Entity.Navigations.Navigation.Terminal), terminal);
             query.Where(nameof(Entity.Navigations.Navigation.IsDisable), false);
+            query.Where(nameof(Entity.Navigations.Navigation.ParentId), 0);
             query.OrderByDesc(nameof(Entity.Navigations.Navigation.Sort));
-            return await _repository.GetAllAsync(query);
+            var result = await _repository.GetAllAsync(query);
+            var navigationResult = result.Select(n => _mapper.Map<NavigationResult>(n));
+            foreach (var item in navigationResult)
+            {
+                item.IsChildren = await IsExistsAsync(item.Id);
+                item.Children = await GetTreeAsync(item.Id, navigationResult.ToList());
+            }
+            return navigationResult;
+        }
+        /// <summary>
+        /// 递归获取子集
+        /// </summary>
+        /// <param name="navigationResult"></param>
+        /// <param name="id"></param>
+        /// <param name="items"></param>
+        /// <returns></returns>
+        public async Task<List<NavigationResult>> GetTreeAsync(int id, List<NavigationResult> items)
+        {
+            foreach (var item in items)
+            {
+                item.IsChildren = await IsExistsAsync(item.Id);
+                if (item.IsChildren)
+                {
+                    var navigations = await _repository.GetAllAsync(Q.Where(nameof(Entity.Navigations.Navigation.ParentId), item.Id));
+                    item.Children = _mapper.Map<List<NavigationResult>>(navigations);
+                    foreach (var childrenItem in item.Children)
+                    {
+                        await GetTreeAsync(childrenItem.Id, item.Children);
+                    }
+                }
+            }
+            return items;
+        }
+        public async Task<bool> IsExistsAsync(int parentId)
+        {
+            return await _repository.ExistsAsync(Q.Where(nameof(Entity.Navigations.Navigation.ParentId), parentId));
+        }
+        /// <summary>
+        /// 获取导航栏数据
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<NavigationMediaResult>> GetNavigationResults(int navigationId)
+        {
+            var result = new List<NavigationMediaResult>();
+            var navigation = await GetAsync(navigationId);
+            if (navigation.Terminal > 0)
+            {
+                //获取中间页面
+                var middleLable = await _middleLableRepository.GetAsync(navigation.MiddleLableId);
+                if (string.IsNullOrEmpty(middleLable.LabelId))
+                    return result;
+                //获取标签
+                var systemLabels = await _systemLabelRepository.GetAllAsync(Q.WhereIn(nameof(Entity.SystemLabel.SystemLabel.Id), StringUtils.StringCollectionToIntList(middleLable.LabelId)));
+                foreach (var item in systemLabels)
+                {
+                    var navigationResult = new NavigationResult()
+                    {
+                        Sort = item.Sort,
+                        StyleType = item.StyleType,
+                        ActionUrl = item.ActionUrl,
+                        ControllerUrl = item.ControllerUrl,
+                        IsPage = item.IsPage,
+                        IsSkip = item.IsSkip,
+                        LabelName = item.LabelName,
+                        ResourceType = item.ResourceType
+                    };
+                    //获取媒体
+
+                }
+            }
+            return result;
         }
     }
 }

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

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Datory;
 using GxPress.Request.Navigation;
+using GxPress.Result.Navigation;
 
 namespace GxPress.Repository.Interface.Navigation
 {
@@ -16,6 +17,11 @@ namespace GxPress.Repository.Interface.Navigation
         Task<bool> UpdateAsync(NavigationUpRequest request);
         Task<bool> UpdateAsync(SqlKata.Query query);
 
-        Task<IEnumerable<Entity.Navigations.Navigation>> GetAllAsync(int terminal);
+        Task<IEnumerable<NavigationResult>> GetAllAsync(int terminal);
+        /// <summary>
+        /// 获取导航栏数据
+        /// </summary>
+        /// <returns></returns>
+        Task<List<NavigationMediaResult>> GetNavigationResults(int navigationId);
     }
 }