1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminCategoryController.cs

@@ -3,6 +3,8 @@ using System.Threading.Tasks;
 using GxPress.Auth;
 using GxPress.Repository.Interface.Category;
 using GxPress.Repository.Interface.TrackLog;
+using GxPress.Result.Category;
+using GxPress.Service.Interface.Category;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -17,15 +19,17 @@ namespace GxPress.Api.AdminControllers
     public class AdminCategoryController : Controller
     {
         private readonly ICategoryRepository categoryRepository;
+        private readonly ICategoryService categoryService;
         private readonly ILoginContext _loginContext;
         private readonly IHttpContextAccessor httpContextAccessor;
         private readonly ITrackLogRepository trackLogRepository;
-        public AdminCategoryController(ICategoryRepository categoryRepository, ILoginContext _loginContext, IHttpContextAccessor httpContextAccessor, ITrackLogRepository trackLogRepository)
+        public AdminCategoryController(ICategoryRepository categoryRepository, ILoginContext _loginContext, IHttpContextAccessor httpContextAccessor, ITrackLogRepository trackLogRepository, ICategoryService categoryService)
         {
             this.categoryRepository = categoryRepository;
             this.httpContextAccessor = httpContextAccessor;
             this._loginContext = _loginContext;
             this.trackLogRepository = trackLogRepository;
+            this.categoryService = categoryService;
         }
         /// <summary>
         /// 详情
@@ -61,7 +65,6 @@ namespace GxPress.Api.AdminControllers
         /// <param name="note"></param>
         /// <returns></returns>
         [HttpPost]
-
         public async Task<bool> InsertAsync(Entity.tede2.Category.Category note)
         {
             var success = await categoryRepository.InsertAsync(note) > 0;
@@ -103,12 +106,12 @@ namespace GxPress.Api.AdminControllers
         /// 查询子集
         /// </summary>
         /// <param name="parentId"></param>
-        /// <param name="typeValue"></param>
+        /// <param name="typeValue"> 类型0 pc 1 app</param>
         /// <returns></returns>
         [HttpGet("children/{parentId}/{typeValue}")]
-        public async Task<IEnumerable<Entity.tede2.Category.Category>> GetCategoryChildrenAsync(int parentId,int typeValue)
+        public async Task<IEnumerable<CategoryResult>> GetCategoryChildrenAsync(int parentId, int typeValue)
         {
-            return await categoryRepository.GetCategoryChildrenAsync(parentId,typeValue);
+            return await categoryService.GetCategoryChildrenAsync(parentId, typeValue);
         }
     }
 }

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminSystemLabelController.cs

@@ -86,5 +86,25 @@ namespace GxPress.Api.AdminControllers
         {
             return await systemLableMediaRepository.InsertAsync(request);
         }
+        /// <summary>
+        /// 获取明栏分页
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("star-page")]
+        public async Task<PagedList<SystemLabelResult>> GetAllStarLablePageAsync(Common.Page.PageParameter request)
+        {
+            return await systemLabelService.GetAllStarLablePageAsync(request);
+
+        }
+        /// <summary>
+        /// 获取明栏
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("star-list")]
+        public async Task<IEnumerable<SystemLabelResult>> GetStarLableAllAsync()
+        {
+            return await systemLabelService.GetStarLableAllAsync();
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/SystemLabel/SystemLabel.cs

@@ -93,5 +93,12 @@ namespace GxPress.Entity.SystemLabel
         /// <value></value>
         [DataColumn]
         public bool IsShowLabelName { get; set; }
+
+        /// <summary>
+        /// 是否明栏
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public bool IsStarLable { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Request/SystemLabel/SystemLabelRequest.cs

@@ -96,5 +96,10 @@ namespace GxPress.Request.SystemLabel
         /// </summary>
         /// <value></value>
         public int IsShowLabelName { get; set; }
+         /// <summary>
+        /// 是否明栏 1 设置 2取消
+        /// </summary>
+        /// <value></value>
+        public int IsStarLable { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Result/Category/ CategoryResult.cs

@@ -11,7 +11,7 @@ namespace GxPress.Result.Category
         /// id
         /// </summary>
         /// <value></value>
-        public int Id{get;set;}
+        public int Id { get; set; }
         /// <summary>
         /// 名称
         /// </summary>
@@ -44,5 +44,10 @@ namespace GxPress.Result.Category
         /// </summary>
         /// <value></value>
         public List<CategoryResult> Children { get; set; }
+        /// <summary>
+        /// 媒体集合
+        /// </summary>
+        /// <value></value>
+        public List<int> MediaIds { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/Category/CategoryRepository.cs

@@ -50,9 +50,9 @@ namespace GxPress.Repository.Implement.Category
             return await _repository.GetAsync(id);
         }
 
-        public async Task<IEnumerable<Entity.tede2.Category.Category>> GetCategoryChildrenAsync(int parentId, int typeValue)
+        public async Task<IEnumerable<CategoryResult>> GetCategoryChildrenAsync(int parentId, int typeValue)
         {
-            var result = await _repository.GetAllAsync(Q.Where(nameof(Entity.tede2.Category.Category.ParentId), parentId).Where(nameof(Entity.tede2.Category.Category.TypeValue), typeValue));
+            var result = await _repository.GetAllAsync<CategoryResult>(Q.Where(nameof(Entity.tede2.Category.Category.ParentId), parentId).Where(nameof(Entity.tede2.Category.Category.TypeValue), typeValue));
             foreach (var item in result)
             {
                 item.IsChildren = await IsChildren(item.Id);

gx_api/GxPress/Repository/GxPress.Repository.Implement/SystemLabel/SystemLabelRepository.cs

@@ -30,7 +30,6 @@ namespace GxPress.Repository.Implement.SystemLabel
             _mapper = mapper;
             mediaLableRepository = new Repository<Entity.tede2.Media.MediaLable>(database);
         }
-
         public IDatabase Database => _repository.Database;
         public string TableName => _repository.TableName;
         public List<TableColumn> TableColumns => _repository.TableColumns;
@@ -82,6 +81,8 @@ namespace GxPress.Repository.Implement.SystemLabel
                     model.IsShowLabelName = request.IsShowLabelName == 1;
                 if (request.PageSize > 0)
                     model.PageSize = request.PageSize;
+                if (request.IsStarLable > 0)
+                    model.IsStarLable = request.IsStarLable == 1;
                 return await _repository.UpdateAsync(model);
             }
             return false;
@@ -90,12 +91,41 @@ namespace GxPress.Repository.Implement.SystemLabel
         {
             return await _repository.UpdateAsync(query) > 0;
         }
-
+        /// <summary>
+        /// 获取标签
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
         public async Task<PagedList<SystemLabelResult>> GetAllPageAsync(Common.Page.PageParameter request)
         {
             var result = new PagedList<SystemLabelResult>();
             var query = Q.NewQuery();
             query.Where(nameof(Entity.SystemLabel.SystemLabel.IsDisable), false);
+            query.Where(nameof(Entity.SystemLabel.SystemLabel.IsStarLable), false);
+            result.Total = await _repository.CountAsync(query);
+            query.OrderByDesc(nameof(Entity.Navigations.Navigation.Sort));
+            query.ForPage(request.Page, request.PerPage);
+            result.Items = await _repository.GetAllAsync<SystemLabelResult>(query);
+            foreach (var item in result.Items)
+            {
+                query = Q.NewQuery();
+                query.Where(nameof(Entity.tede2.Media.MediaLable.LableId), item.Id);
+                //获取资源数量
+                item.ResourceCount = await mediaLableRepository.CountAsync(query);
+            }
+            return result;
+        }
+        /// <summary>
+        /// 获取明栏
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<PagedList<SystemLabelResult>> GetAllStarLablePageAsync(Common.Page.PageParameter request)
+        {
+            var result = new PagedList<SystemLabelResult>();
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.SystemLabel.SystemLabel.IsDisable), false);
+            query.Where(nameof(Entity.SystemLabel.SystemLabel.IsStarLable), true);
             result.Total = await _repository.CountAsync(query);
             query.OrderByDesc(nameof(Entity.Navigations.Navigation.Sort));
             query.ForPage(request.Page, request.PerPage);
@@ -109,11 +139,25 @@ namespace GxPress.Repository.Implement.SystemLabel
             }
             return result;
         }
+        /// <summary>
+        /// 获取明栏
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IEnumerable<SystemLabelResult>> GetStarLableAllAsync()
+        {
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.SystemLabel.SystemLabel.IsDisable), false);
+            query.Where(nameof(Entity.SystemLabel.SystemLabel.IsStarLable), true);
+            query.OrderByDesc(nameof(Entity.Navigations.Navigation.Sort));
+            var result = await _repository.GetAllAsync<SystemLabelResult>(query);
+            return result;
+        }
         public async Task<IEnumerable<SystemLabelResult>> GetAllAsync()
         {
             var query = Q.NewQuery();
             query.Where(nameof(Entity.SystemLabel.SystemLabel.IsDisable), false);
             query.OrderByDesc(nameof(Entity.Navigations.Navigation.Sort));
+            query.Where(nameof(Entity.SystemLabel.SystemLabel.IsStarLable), false);
             var result = await _repository.GetAllAsync<SystemLabelResult>(query);
             return result;
         }
@@ -121,7 +165,5 @@ namespace GxPress.Repository.Implement.SystemLabel
         {
             return await _repository.GetAllAsync(Q.WhereIn(nameof(Entity.SystemLabel.SystemLabel.Id), ids));
         }
-
-
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/Category/CategoryRepository.cs

@@ -31,7 +31,7 @@ namespace GxPress.Repository.Interface.Category
         /// </summary>
         /// <param name="parentId"></param>
         /// <returns></returns>
-        Task<IEnumerable<Entity.tede2.Category.Category>> GetCategoryChildrenAsync(int parentId, int typeValue);
+        Task<IEnumerable<CategoryResult>> GetCategoryChildrenAsync(int parentId, int typeValue);
 
         Task<string> GetCategoryParentAsync(int id, string categoryName);
         /// <summary>

gx_api/GxPress/Repository/GxPress.Repository.Interface/SystemLabel/ISystemLabelRepository.cs

@@ -20,5 +20,16 @@ namespace GxPress.Repository.Interface.SystemLabel
         Task<IEnumerable<Entity.SystemLabel.SystemLabel>> GetAllAsync(List<int> ids);
         Task<Entity.SystemLabel.SystemLabel> GetByNameAsync(string name);
         Task<IEnumerable<SystemLabelResult>> GetAllAsync();
+        /// <summary>
+        /// 获取明栏
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<PagedList<SystemLabelResult>> GetAllStarLablePageAsync(Common.Page.PageParameter request);
+        /// <summary>
+        /// 获取明栏
+        /// </summary>
+        /// <returns></returns>
+        Task<IEnumerable<SystemLabelResult>> GetStarLableAllAsync();
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/Category/CategoryService.cs

@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using GxPress.Repository.Interface.Category;
+using GxPress.Repository.Interface.SystemLabel;
+using GxPress.Result.Category;
+using GxPress.Service.Interface.Category;
+namespace GxPress.Service.Implement.Category
+{
+    public class CategoryService : ICategoryService
+    {
+        private readonly ICategoryRepository categoryRepository;
+        private readonly ISystemLableMediaRepository systemLableMediaRepository;
+        public CategoryService(ICategoryRepository categoryRepository, ISystemLableMediaRepository systemLableMediaRepository)
+        {
+            this.categoryRepository = categoryRepository;
+            this.systemLableMediaRepository = systemLableMediaRepository;
+        }
+        /// <summary>
+        /// 内容导航分类
+        /// </summary>
+        /// <param name="typeValue"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<CategoryResult>> GetCategoryAllAsync(int typeValue = 0)
+        {
+            var result = await categoryRepository.GetCategoryAllAsync(typeValue);
+            foreach (var item in result)
+            {
+                if (!item.IsChildren)
+                {
+                    var mediaIds = await systemLableMediaRepository.GetMediaIdsAsync(item.Id, 1);
+                    item.MediaIds = mediaIds.ToList();
+                }
+            }
+            return result;
+        }
+        public async Task<IEnumerable<CategoryResult>> GetCategoryChildrenAsync(int parentId, int typeValue)
+        {
+            var result = await categoryRepository.GetCategoryChildrenAsync(parentId, typeValue);
+            foreach (var item in result)
+            {
+                if (!item.IsChildren)
+                {
+                    var mediaIds = await systemLableMediaRepository.GetMediaIdsAsync(item.Id, 1);
+                    item.MediaIds = mediaIds.ToList();
+                }
+            }
+            return result;
+        }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Implement/SystemLabel/SystemLabelService.cs

@@ -22,14 +22,37 @@ namespace GxPress.Service.Implement.SystemLabel
             var result = await systemLabelRepository.GetAllPageAsync(request);
             foreach (var item in result.Items)
             {
-                item.MediaIds = await systemLableMediaRepository.GetMediaIdsAsync(item.Id,0);
+                item.MediaIds = await systemLableMediaRepository.GetMediaIdsAsync(item.Id, 0);
             }
             return result;
         }
-         public async Task<IEnumerable<SystemLabelResult>> GetAllAsync()
+        public async Task<IEnumerable<SystemLabelResult>> GetAllAsync()
         {
             var result = await systemLabelRepository.GetAllAsync();
             return result;
         }
+        /// <summary>
+        /// 获取明栏分页
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<PagedList<SystemLabelResult>> GetAllStarLablePageAsync(Common.Page.PageParameter request)
+        {
+            var result = await systemLabelRepository.GetAllStarLablePageAsync(request);
+            foreach (var item in result.Items)
+            {
+                item.MediaIds = await systemLableMediaRepository.GetMediaIdsAsync(item.Id, 0);
+            }
+            return result;
+        }
+        /// <summary>
+        /// 获取明栏
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IEnumerable<SystemLabelResult>> GetStarLableAllAsync()
+        {
+            var result = await systemLabelRepository.GetStarLableAllAsync();
+            return result;
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/Category/ICategoryService.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GxPress.Result.Category;
+
+namespace GxPress.Service.Interface.Category
+{
+    public interface ICategoryService : IService
+    {
+        /// <summary>
+        /// 内容导航分类
+        /// </summary>
+        /// <param name="typeValue"></param>
+        /// <returns></returns>
+        Task<IEnumerable<CategoryResult>> GetCategoryAllAsync(int typeValue = 0);
+        Task<IEnumerable<CategoryResult>> GetCategoryChildrenAsync(int parentId, int typeValue);
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Interface/SystemLabel/ISystemLabelService.cs

@@ -8,6 +8,17 @@ namespace GxPress.Service.Interface.SystemLabel
     public interface ISystemLabelService : IService
     {
         Task<PagedList<SystemLabelResult>> GetAllPageAsync(Common.Page.PageParameter request);
-         Task<IEnumerable<SystemLabelResult>> GetAllAsync();
+        Task<IEnumerable<SystemLabelResult>> GetAllAsync();
+        /// <summary>
+        /// 获取明栏分页
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<PagedList<SystemLabelResult>> GetAllStarLablePageAsync(Common.Page.PageParameter request);
+        /// <summary>
+        /// 获取明栏
+        /// </summary>
+        /// <returns></returns>
+        Task<IEnumerable<SystemLabelResult>> GetStarLableAllAsync();
     }
 }