1

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebTopicController.cs

@@ -120,7 +120,7 @@ namespace GxPress.Api.WebControllers
         {
             request.UserId = _loginContext.AccountId;
             if (request.UserId <= 0)
-                return await _topicRepository.GetAnonymousGroupTopicPageAsync(request);
+                return await _topicService.GetAnonymousGroupTopicPageAsync(request);
             return await _topicService.GetGroupTopicPageAsync(request);
         }
         /// <summary>

gx_api/GxPress/Service/GxPress.Service.Implement/Topic/TopicService.cs

@@ -53,9 +53,9 @@ namespace GxPress.Service.Implement.Topic
             ITopicGroupUserRepository topicGroupUserRepository, IAnalyzeService analyzeService,
             ICommentRepository commentRepository, IMapper mapper, IDepartmentRepository departmentRepository,
             IGroupUserRepository groupUserRepository, IFolderUserRepository folderUserRepository,
-            INoteService noteService, IMiddleRepository middleRepository, 
-            IVisitRepository visitRepository, IVisitService visitService, 
-            IDepartmentUserRepository departmentUserRepository, 
+            INoteService noteService, IMiddleRepository middleRepository,
+            IVisitRepository visitRepository, IVisitService visitService,
+            IDepartmentUserRepository departmentUserRepository,
             INoteRepository noteRepository,
             IGroupRepository groupRepository)
         {
@@ -76,7 +76,7 @@ namespace GxPress.Service.Implement.Topic
             _visitService = visitService;
             this.departmentUserRepository = departmentUserRepository;
             this.noteRepository = noteRepository;
-            this.groupRepository=groupRepository;
+            this.groupRepository = groupRepository;
         }
 
 
@@ -174,6 +174,76 @@ namespace GxPress.Service.Implement.Topic
             }
             return result;
         }
+        /// <summary>
+        ///最新 小组话题分页列表 匿名用户
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<PagedList<TopicListPageResult>> GetAnonymousGroupTopicPageAsync(TopicDetailListRequest request)
+        {
+            var result = await _topicRepository.GetAnonymousGroupTopicPageAsync(request);
+            //获取数量
+            // result.Total = 10;
+            foreach (var item in result.Items)
+            {
+                if (string.IsNullOrEmpty(item.Title))
+                    item.Title = string.Empty;
+                if (string.IsNullOrWhiteSpace(item.UserName))
+                {
+                    item.Content = "[]";
+                    item.Data = JsonConvert.DeserializeObject<List<ContentJsonData>>(item.Content);
+                    item.Content = "";
+                    continue;
+                }
+                if (string.IsNullOrWhiteSpace(item.Content))
+                    item.Content = "[]";
+                var contentJsonData = JsonConvert.DeserializeObject<List<ContentJsonData>>(item.Content);
+                foreach (var contentJsonDataItem in contentJsonData)
+                    contentJsonDataItem.File = StringUtils.AddDomain(contentJsonDataItem.File);
+                if (contentJsonData.Count == 0)
+                    item.DataType = 1;
+                item.Content = "";
+                if (contentJsonData.Count > 0)
+                {
+                    var imgData = new List<ContentJsonData>();
+                    var FileData = new List<ContentJsonData>();
+                    var forCount = 1;
+                    var firstContent = string.Empty;
+                    foreach (var jsonData in contentJsonData)
+                    {
+                        if (jsonData.Type == AllTypeConst.Text.GetHashCode() && forCount == 1)
+                            //文本
+                            firstContent = jsonData.Text;
+                        else if (jsonData.Type == AllTypeConst.Text.GetHashCode() && forCount > 1)
+                            //文本
+                            continue;
+                        //图片
+                        else if (jsonData.Type == AllTypeConst.Image.GetHashCode() && FileData.Count == 0)
+                        {
+                            if (imgData.Count >= 9)
+                                break;
+                            imgData.Add(jsonData);
+                        }
+                        //附件
+                        else
+                        {
+                            FileData.Add(jsonData);
+                            break;
+                        }
+                        forCount++;
+                    }
+                    item.Content = string.IsNullOrWhiteSpace(firstContent) ? "" : firstContent;
+                    if (imgData.Count > 0) { item.DataType = 2; item.Data = imgData; }
+                    else if (FileData.Count > 0) { item.DataType = 3; item.Data = FileData; }
+                    else item.DataType = 1;
+                    var contType = new List<int> { AllTypeConst.Text.GetHashCode(), AllTypeConst.Image.GetHashCode() };
+                    item.FileCount = contentJsonData.Count(n => !contType.Contains(n.Type));
+                }
+                if (item.Data == null || item.Data.Count == 0)
+                    item.Data = new List<ContentJsonData>();
+            }
+            return result;
+        }
         public async Task<PagedList<TopicListPageResult>> GetTopicByGroupAsync(TopicPageSearchRequest request)
         {
             var result = await _topicRepository.GetTopicByGroupAsync(request);

gx_api/GxPress/Service/GxPress.Service.Interface/Topic/ITopicService.cs

@@ -10,7 +10,7 @@ namespace GxPress.Service.Interface.Topic
 {
     public interface ITopicService : IService
     {
-       
+
 
         /// <summary>
         /// 根据GroupId删除
@@ -63,31 +63,37 @@ namespace GxPress.Service.Interface.Topic
         /// <returns></returns>
         Task<bool> MoveToGroupAsync(MoveToGroupRequest request);
 
-         /// <summary>
+        /// <summary>
         /// 获取话题详情
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-       Task<TopicDetailResult> GetTopicDetailResultAsync(TopicDetailRequest request);
+        Task<TopicDetailResult> GetTopicDetailResultAsync(TopicDetailRequest request);
 
         /// <summary>
         /// 根据GroupId获取通知
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-       Task<PagedList<TopicListPageResult>> FindTopicByGroupIdAsync(TopicDetailListRequest request);
+        Task<PagedList<TopicListPageResult>> FindTopicByGroupIdAsync(TopicDetailListRequest request);
         /// <summary>
         /// 获取话题列表
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-       Task<PagedList<TopicListPageResult>> GetTopicPageAsync(TopicPageSearchRequest request);
+        Task<PagedList<TopicListPageResult>> GetTopicPageAsync(TopicPageSearchRequest request);
         Task<PagedList<TopicListPageResult>> GetTopicByGroupAsync(TopicPageSearchRequest request);
-         /// <summary>
+        /// <summary>
         ///最新 小组话题分页列表
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
         Task<PagedList<TopicListPageResult>> GetGroupTopicPageAsync(TopicDetailListRequest request);
+        /// <summary>
+        ///最新 小组话题分页列表 匿名用户
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<PagedList<TopicListPageResult>> GetAnonymousGroupTopicPageAsync(TopicDetailListRequest request);
     }
 }