1

gx_api/GxPress/Api/GxPress.Api/AppControllers/AppPageController.cs

@@ -16,6 +16,7 @@ using GxPress.Common.Tools;
 using GxPress.Result.Category;
 using GxPress.Repository.Interface.Category;
 using GxPress.Service.Interface.Media;
+using GxPress.Result.Navigation;
 
 namespace GxPress.Api.AppControllers
 {
@@ -265,5 +266,26 @@ namespace GxPress.Api.AppControllers
         {
             return await mediaService.GetStarLablePageAsync(request);
         }
+        /// <summary>
+        /// 获取搜索作者
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("teacher/{categoryId}")]
+        [AllowAnonymous]
+        public async Task<IEnumerable<NavigationSearchTeacherResult>> GetNavigationSearchResultAysnc(int categoryId)
+        {
+            return await appHomePageService.GetNavigationSearchResultAysnc(categoryId);
+        }
+        /// <summary>
+        /// 获取出版社
+        /// </summary>
+        /// <param name="categoryId"></param>
+        /// <returns></returns>
+        [HttpGet("press/{categoryId}")]
+        [AllowAnonymous]
+        public async Task<IEnumerable<string>> GetNavigationPressAsync(int categoryId)
+        {
+            return await appHomePageService.GetNavigationPressAsync(categoryId);
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Request/Navigation/NavigationRequest.cs

@@ -5,6 +5,33 @@ namespace GxPress.Request.Navigation
 
     }
     /// <summary>
+    /// 内容导航搜索
+    /// </summary>
+    public class NavigationSearchRequest
+    {
+        /// <summary>
+        /// 分类ID
+        /// </summary>
+        /// <value></value>
+        public int CategoryId { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        /// <value></value>
+        public string BeginTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        /// <value></value>
+        public string EndTime { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <value></value>
+        public string Sort { get; set; }
+
+    }
+    /// <summary>
     /// 修改导航
     /// </summary>
     public class NavigationUpRequest
@@ -57,17 +84,17 @@ namespace GxPress.Request.Navigation
         /// <value></value>
 
         public int Terminal { get; set; }
-         /// <summary>
+        /// <summary>
         /// 路径
         /// </summary>
         /// <value></value>
-  
+
         public string ControllerUrl { get; set; }
         /// <summary>
         /// 路径
         /// </summary>
         /// <value></value>
-      
+
         public string ActionUrl { get; set; }
     }
 }

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

@@ -270,4 +270,36 @@ namespace GxPress.Result.Navigation
         /// <value></value>
         public IEnumerable<NavigationMediaResult> RecommendMediaResults { get; set; }
     }
+    /// <summary>
+    /// 导航搜索
+    /// </summary>
+    public class NavigationSearchResult
+    {
+        /// <summary>
+        /// 作者
+        /// </summary>
+        /// <value></value>
+        public IEnumerable<NavigationSearchTeacherResult> TeacherItem { get; set; }
+    }
+    /// <summary>
+    /// 老师搜索
+    /// </summary>
+    public class NavigationSearchTeacherResult
+    {
+        /// <summary>
+        /// 老师ID
+        /// </summary>
+        /// <value></value>
+        public int TeacherId { get; set; }
+        /// <summary>
+        /// 作者
+        /// </summary>
+        /// <value></value>
+        public string Author { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <value></value>
+        public int Count { get; set; }
+    }
 }

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

@@ -816,7 +816,7 @@ namespace GxPress.Repository.Implement.Media
             query.Select(nameof(Entity.tede2.Media.Media.CreatedDate));
             if (!string.IsNullOrEmpty(request.KeyWord))
                 query.WhereLike(nameof(Entity.tede2.Media.Media.Title), $"%{request.KeyWord}%");
-            query.Where(nameof(Entity.tede2.Media.Media.AttachId), request.MediaIds);
+            query.WhereIn(nameof(Entity.tede2.Media.Media.Id), request.MediaIds);
             resut.Total = await _repository.CountAsync(query);
             if (!string.IsNullOrEmpty(request.Sort))
             {
@@ -827,6 +827,10 @@ namespace GxPress.Repository.Implement.Media
                 query.OrderByDesc(nameof(Entity.tede2.Media.Media.CreatedDate));
             query.ForPage(request.Page, request.PerPage);
             resut.Items = await _repository.GetAllAsync<MediaCathedraResult>(query);
+            foreach (var item in resut.Items)
+            {
+                item.ImageUrls = StringUtils.AddDomain(item.ImageUrls);
+            }
             return resut;
         }
         /// <summary>
@@ -854,7 +858,12 @@ namespace GxPress.Repository.Implement.Media
             else
                 query.OrderByDesc(nameof(Entity.tede2.Media.Media.CreatedDate));
             query.ForPage(request.Page, request.PerPage);
-            return await _repository.GetAllAsync<MediaCathedraResult>(query); ;
+            var reuslt = await _repository.GetAllAsync<MediaCathedraResult>(query);
+            foreach (var item in reuslt)
+            {
+                item.ImageUrls = StringUtils.AddDomain(item.ImageUrls);
+            }
+            return reuslt;
         }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/AppHomePage/AppHomePageService.Search.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Dapper;
+using Datory;
+using GxPress.Result.Navigation;
+
+namespace GxPress.Service.Implement.AppHomePage
+{
+    public partial class AppHomePageService
+    {
+        /// <summary>
+        /// 获取搜索作者
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IEnumerable<NavigationSearchTeacherResult>> GetNavigationSearchResultAysnc(int categoryId)
+        {
+            var result = new List<NavigationSearchTeacherResult>();
+            var database = new Database(DatabaseType.MySql, Common.Tools.ConfigHelper.GetValue("Database:ConnectionString"));
+            var connection = database.GetConnection();
+            var sql = $"SELECT TeacherId,Author,count(1) as Count FROM tede_media where id in(select MediaId from tede_system_lable_media where TypeValue=1) and  Author is not null group by Author,TeacherId";
+            if (categoryId > 0)
+                sql = $"SELECT TeacherId,Author,count(1) as Count FROM tede_media where id in(select MediaId from tede_system_lable_media where TypeValue=1 and lableId={categoryId}) and  Author is not null group by Author,TeacherId";
+            return await connection.QueryAsync<NavigationSearchTeacherResult>(sql);
+        }
+        /// <summary>
+        /// 获取出版社
+        /// </summary>
+        /// <param name="categoryId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<string>> GetNavigationPressAsync(int categoryId)
+        {
+            var sql = "SELECT Press FROM tede_media where id in(select MediaId from tede_system_lable_media where TypeValue=1) and  Press is not null group by Press";
+            if (categoryId > 0)
+                sql = "SELECT Press FROM tede_media where id in(select MediaId from tede_system_lable_media where TypeValue=1 and lableId={categoryId}) and  Press is not null group by Press";
+            var result = new List<NavigationSearchTeacherResult>();
+            var database = new Database(DatabaseType.MySql, Common.Tools.ConfigHelper.GetValue("Database:ConnectionString"));
+            var connection = database.GetConnection();
+            return await connection.QueryAsync<string>(sql);
+        }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Implement/AppHomePage/AppHomePageService.cs

@@ -19,7 +19,7 @@ using GxPress.Result.Teacher;
 
 namespace GxPress.Service.Implement.AppHomePage
 {
-    public class AppHomePageService : IAppHomePageService
+    public partial class AppHomePageService : IAppHomePageService
     {
         private readonly IArticleGroupRepository articleGroupRepository;
         private readonly IMediaRepository mediaRepository;

gx_api/GxPress/Service/GxPress.Service.Implement/Media/MediaService.StarLable.cs

@@ -26,8 +26,8 @@ namespace GxPress.Service.Implement.Media
                 var meidas = await systemLableMediaRepository.GetMediaIdsAsync(item.Id, 0);
                 var request = new MediaStarLableRequest()
                 {
-                    Page=1,
-                    PerPage=item.PageSize,
+                    Page = 1,
+                    PerPage = item.PageSize,
                     MediaIds = meidas.ToList()
                 };
                 var mediaStarLableResult = new MediaStarLableResult()
@@ -47,6 +47,8 @@ namespace GxPress.Service.Implement.Media
         public async Task<PagedList<MediaCathedraResult>> GetStarLablePageAsync(MediaStarLableRequest request)
         {
             var meidas = await systemLableMediaRepository.GetMediaIdsAsync(request.Id, 0);
+            if (meidas == null)
+                return new PagedList<MediaCathedraResult>();
             request.MediaIds = meidas.ToList();
             return await mediaRepository.GetStarLablePageAsync(request);
         }

gx_api/GxPress/Service/GxPress.Service.Interface/AppHomePage/IAppHomePageService.cs

@@ -5,6 +5,7 @@ using GxPress.Request.ArticleGroup;
 using GxPress.Request.Media;
 using GxPress.Request.TeacherRequest;
 using GxPress.Result.Media;
+using GxPress.Result.Navigation;
 using GxPress.Result.SystemLabel;
 using GxPress.Result.Teacher;
 
@@ -61,5 +62,16 @@ namespace GxPress.Service.Interface.AppHomePage
         /// </summary>
         /// <returns></returns>
         Task<PagedList<MediaCathedraResult>> GetContentNavigationAsync(MediaContentNavigationRequest request);
+         /// <summary>
+        /// 获取搜索作者
+        /// </summary>
+        /// <returns></returns>
+       Task<IEnumerable<NavigationSearchTeacherResult>> GetNavigationSearchResultAysnc(int categoryId);
+        /// <summary>
+        /// 获取出版社
+        /// </summary>
+        /// <param name="categoryId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<string>> GetNavigationPressAsync(int categoryId);
     }
 }