1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminArticleGroupController.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using GxPress.Entity;
 using GxPress.Repository.Interface;
 using GxPress.Request.ArticleGroup;
+using GxPress.Result.Article;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -34,7 +35,17 @@ namespace GxPress.Api.AdminControllers
         {
             return await _processGroupRepository.AddAsync(request);
         }
-
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("{id}")]
+        [AllowAnonymous]
+        public async Task<ArticleGroupResult> Add(int id)
+        {
+            return await _processGroupRepository.GetAsync(id);
+        }
         /// <summary>
         /// 列表
         /// </summary>
@@ -52,7 +63,7 @@ namespace GxPress.Api.AdminControllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPut("{id}")]
-        public async Task<bool> Update(int id, [FromBody]ArticleGroupAddRequest request)
+        public async Task<bool> Update(int id, [FromBody] ArticleGroupAddRequest request)
         {
             return await _processGroupRepository.UpdateAsync(id, request);
         }

gx_api/GxPress/Model/GxPress.Entity/ArticleGroup.cs

@@ -1,10 +1,9 @@
-using Datory;
 using Datory.Annotations;
 
 namespace GxPress.Entity
 {
     /// <summary>
-    /// 文章分组
+    /// app首页导航分组
     /// </summary>
     [DataTable("tede_article_group")]
     public class ArticleGroup : Datory.Entity
@@ -12,13 +11,35 @@ namespace GxPress.Entity
         /// <summary>
         /// 名称
         /// </summary>
-        [DataColumn] 
+        [DataColumn]
         public string Name { get; set; }
-
         /// <summary>
         /// 排序
         /// </summary>
-        [DataColumn] 
+        [DataColumn]
         public int Sort { get; set; }
+        /// <summary>
+        /// 系统默认
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public bool IsSystemDefault { get; set; }
+        /// <summary>
+        /// 是否中间页面
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public bool IsMiddleLable { get; set; }
+        /// <summary>
+        /// 中间页面ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int MiddleLableId { get; set; }
+        /// <summary>
+        /// 样式
+        /// </summary>
+        /// <value></value>
+        public string StyleCss { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.EnumConst/AppPageStyleCssConst.cs

@@ -0,0 +1,29 @@
+using System.ComponentModel;
+
+namespace GxPress.EnumConst
+{
+    /// <summary>
+    /// APP首页导航样式
+    /// </summary>
+    public enum AppPageStyleCssConst
+    {
+        [Description("大咖讲座")]
+        Cathedra,
+        [Description("会员特供")]
+        VipSupply,
+        [Description("每日好文")]
+        DayGoodText,
+        [Description("每日好书")]
+        DayGoodBook,
+        [Description("每日微课")]
+        DayWeBook,
+        [Description("信源听说")]
+        ChatHearSpeak,
+        [Description("每日一题")]
+        DayProblem,
+        [Description("名师")]
+        StarTeacher,
+        [Description("名校")]
+        StarSchool
+    }
+}

gx_api/GxPress/Model/GxPress.Request/ArticleGroup/ArticleGroupAddRequest.cs

@@ -14,5 +14,28 @@ namespace GxPress.Request.ArticleGroup
         /// 排序
         /// </summary>
         public int Sort { get; set; }
+        /// <summary>
+        /// 系统默认
+        /// </summary>
+        /// <value></value>
+
+        public bool IsSystemDefault { get; set; }
+        /// <summary>
+        /// 是否中间页面
+        /// </summary>
+        /// <value></value>
+
+        public bool IsMiddleLable { get; set; }
+        /// <summary>
+        /// 中间页面ID
+        /// </summary>
+        /// <value></value>
+
+        public int MiddleLableId { get; set; }
+        /// <summary>
+        /// 样式
+        /// </summary>
+        /// <value></value>
+        public string StyleCss { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Result/Article/ArticleGroupResult.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+
+namespace GxPress.Result.Article
+{
+    /// <summary>
+    /// 获取
+    /// </summary>
+    public class ArticleGroupResult
+    {
+        /// <summary>
+        /// 自增ID
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+
+        public int Sort { get; set; }
+        /// <summary>
+        /// 系统默认
+        /// </summary>
+        /// <value></value>
+
+        public bool IsSystemDefault { get; set; }
+        /// <summary>
+        /// 是否中间页面
+        /// </summary>
+        /// <value></value>
+
+        public bool IsMiddleLable { get; set; }
+        /// <summary>
+        /// 中间页面ID
+        /// </summary>
+        /// <value></value>
+
+        public int MiddleLableId { get; set; }
+        /// <summary>
+        /// 样式
+        /// </summary>
+        /// <value></value>
+        public string StyleCss { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public Dictionary<string, string> StyleCssDictionary { get; set; }
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Implement/ArticleGroupRepository.cs

@@ -9,6 +9,9 @@ using GxPress.Request.ArticleGroup;
 using Microsoft.Extensions.Options;
 using Datory;
 using Dapper;
+using GxPress.Result.Article;
+using System;
+using GxPress.EnumConst;
 
 namespace GxPress.Repository.Implement
 {
@@ -44,11 +47,28 @@ namespace GxPress.Repository.Implement
             return await _repository.InsertAsync(processGroup);
         }
 
-        public async Task<ArticleGroup> GetAsync(int id)
+        public async Task<ArticleGroupResult> GetAsync(int id)
+        {
+            if (id == 0)
+            {
+                var result = new ArticleGroupResult();
+                result.StyleCssDictionary = new Dictionary<string, string>();
+                Type t = typeof(AppPageStyleCssConst);
+                Array arrays = Enum.GetValues(t);
+                for (int i = 0; i < arrays.LongLength; i++)
+                {
+                    var appPageStyleCssConst = (AppPageStyleCssConst)arrays.GetValue(i);
+                    var descriptionattrib = appPageStyleCssConst.GetDescriptionOriginal();
+                    result.StyleCssDictionary.Add(descriptionattrib, appPageStyleCssConst.ToString());
+                }
+                return result;
+            }
+            return await _repository.GetAsync<ArticleGroupResult>(Q.Where(nameof(Entity.ArticleGroup.Id), id));
+        }
+        public async Task<ArticleGroup> GetArticleGroupAsync(int id)
         {
             return await _repository.GetAsync(id);
         }
-
         public async Task<bool> UpdateAsync(ArticleGroup processGroup)
         {
             return await _repository.UpdateAsync(processGroup);
@@ -75,9 +95,12 @@ namespace GxPress.Repository.Implement
             var group = new ArticleGroup
             {
                 Name = request.Name,
-                Sort = request.Sort
+                Sort = request.Sort,
+                IsMiddleLable = request.IsMiddleLable,
+                IsSystemDefault = request.IsSystemDefault,
+                MiddleLableId = request.MiddleLableId,
+                StyleCss = request.StyleCss
             };
-
             group.Id = await InsertAsync(group);
             return group;
         }
@@ -90,18 +113,15 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<bool> UpdateAsync(int id, ArticleGroupAddRequest request)
         {
-            var group = await GetAsync(id);
+            var group = await GetArticleGroupAsync(id);
             if (group == null) throw new BusinessException("该分组不存在");
-
             if (group.Name != request.Name)
             {
                 var exist = await IsNameExistsAsync(request.Name);
                 if (exist) throw new BusinessException("分组名不能重复");
             }
-
             group.Name = request.Name;
             group.Sort = request.Sort;
-
             return await UpdateAsync(group);
         }
 

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupRepository.cs

@@ -54,7 +54,6 @@ namespace GxPress.Repository.Implement
         {
             if (string.IsNullOrEmpty(request.Name))
                 throw new BusinessException("小组名称不能为空");
-
             var group = new Entity.Group
             {
                 Name = request.Name,

gx_api/GxPress/Repository/GxPress.Repository.Interface/IArticleGroupRepository.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using GxPress.Entity;
 using GxPress.Request.ArticleGroup;
 using Datory;
+using GxPress.Result.Article;
 
 namespace GxPress.Repository.Interface
 {
@@ -14,7 +15,7 @@ namespace GxPress.Repository.Interface
 
         Task<int> InsertAsync(ArticleGroup processGroup);
 
-        Task<ArticleGroup> GetAsync(int id);
+        Task<ArticleGroupResult> GetAsync(int id);
 
         Task<bool> UpdateAsync(ArticleGroup processGroup);
 
@@ -41,5 +42,6 @@ namespace GxPress.Repository.Interface
         /// <param name="id"></param>
         /// <returns></returns>
         Task<bool> DeleteAsync(int id);
+        Task<ArticleGroup> GetArticleGroupAsync(int id);
     }
 }