1

gx_api/GxPress/Api/GxPress.Api/AppControllers/NoteController.cs

@@ -155,5 +155,11 @@ namespace GxPress.Api.AppControllers
         {
             return await _noteService.DraftDeleteAsync(id);
         }
+        [HttpGet("update/list")]
+        [AllowAnonymous]
+        public async Task<bool> UpdateNoteTextContentAsync()
+        {
+            return await _noteService.UpdateNoteTextContentAsync();
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/Note/Note.cs

@@ -19,6 +19,12 @@ namespace GxPress.Entity.Note
         [DataColumn]
         public string Content { get; set; }
         /// <summary>
+        /// 纯文本
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string TextContent { get; set; }
+        /// <summary>
         /// 内容
         /// </summary>
         [DataColumn]

gx_api/GxPress/Repository/GxPress.Repository.Implement/Note/NoteRepository.cs

@@ -301,9 +301,9 @@ namespace GxPress.Repository.Implement.Note
                         sql += "and  (a.RoleId in(1,3))";
                 }
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId} AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" and a.ParentId={request.FolderId} AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%')";
+                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else
                     sql += $" and a.ParentId={request.FolderId}";
                 sql +=
@@ -419,9 +419,9 @@ namespace GxPress.Repository.Implement.Note
                         sql += "and  (a.RoleId in(1,3))";
                 }
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%')";
+                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else
                     sql += $" and a.ParentId={request.FolderId}";
                 sql +=
@@ -483,9 +483,9 @@ namespace GxPress.Repository.Implement.Note
                         sql += "and  (a.RoleId in(1,3))";
                 }
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%')";
+                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else
                     sql += $" and a.ParentId={request.FolderId}";
             }
@@ -503,9 +503,9 @@ namespace GxPress.Repository.Implement.Note
                         sql += " and  (a.RoleId in(1,3))";
                 }
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId} AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" and a.ParentId={request.FolderId} AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else
                     sql += $" and a.ParentId={request.FolderId}";
             }
@@ -697,7 +697,7 @@ namespace GxPress.Repository.Implement.Note
                                 a.IsTopic = 1";
             if (!string.IsNullOrEmpty(request.SearchKey))
             {
-                sql += $@"  and (b.Name like '%11%' or a.Title like '%11%' or a.Content like '%11%')";
+                sql += $@"  and (b.Name like '%11%' or a.Title like '%11%' or a.TextContent like '%11%')";
             }
             sql += $@" AND (a.FolderId IN (SELECT 
                                         Id
@@ -746,7 +746,7 @@ namespace GxPress.Repository.Implement.Note
                                 a.IsTopic = 1";
             if (!string.IsNullOrEmpty(request.SearchKey))
             {
-                sql += $@"  and (b.Name like '%11%' or a.Title like '%11%' or a.Content like '%11%')";
+                sql += $@"  and (b.Name like '%11%' or a.Title like '%11%' or a.TextContent like '%11%')";
             }
             sql += $@" AND (a.FolderId IN (SELECT 
                                         Id
@@ -780,7 +780,7 @@ namespace GxPress.Repository.Implement.Note
             var sqlValue = "";
             if (!string.IsNullOrEmpty(request.SearchKey))
             {
-                sqlValue += $" and (a.Title like '%{request.SearchKey}%' or a.Content like '%{request.SearchKey}%')";
+                sqlValue += $" and (a.Title like '%{request.SearchKey}%' or a.TextContent like '%{request.SearchKey}%')";
             }
             var noteConstValue = GxPress.EnumConst.AllTypeConst.Note.GetHashCode();
             var sql = $@"SELECT 
@@ -977,6 +977,11 @@ namespace GxPress.Repository.Implement.Note
             query.Where(nameof(Entity.Note.Note.IsDraft), true);
             return await _repository.DeleteAsync(query) > 0;
         }
+
+        public async Task<IEnumerable<Entity.Note.Note>> GetAllAsync(SqlKata.Query query)
+        {
+            return await _repository.GetAllAsync(query);
+        }
     }
 }
 

gx_api/GxPress/Repository/GxPress.Repository.Interface/Note/INoteRepository.cs

@@ -106,5 +106,7 @@ namespace GxPress.Repository.Interface.Note
         /// <param name="typeValue"></param>
         /// <returns></returns>
        Task<bool> ClearDraftAsync(int userId, int typeValue);
+
+       Task<IEnumerable<Entity.Note.Note>> GetAllAsync(SqlKata.Query query);
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/Doc/DocService.cs

@@ -9,7 +9,6 @@ using GxPress.Common.Tools;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 namespace GxPress.Service.Implement.Doc
 {
     public class DocService : IDocService

gx_api/GxPress/Service/GxPress.Service.Implement/Note/NoteService.cs

@@ -104,8 +104,13 @@ namespace GxPress.Service.Implement.Note
                     if (string.IsNullOrEmpty(request.Content))
                         throw new BusinessException("内容未填写");
                     var noteContent = JsonConvert.DeserializeObject<List<ContentJsonData>>(request.Content);
+                    var textContent = string.Empty;
                     foreach (var item in noteContent)
+                    {
                         item.File = StringUtils.RemoveDomain(item.File);
+                        if (item.Type == AllTypeConst.Text.GetHashCode())
+                            textContent += item.Text;
+                    }
                     //获取公开
                     if (request.FolderId == 0 && request.IsTopic)
                         request.FolderId = await _middleRepository.GetSytemFolderAsync(request.UserId);
@@ -123,6 +128,7 @@ namespace GxPress.Service.Implement.Note
                         MediaType = request.MediaType,
                         CatalogId = request.CatalogId,
                         ChapterId = request.ChapterId,
+                        TextContent = textContent,
                         //是否草稿
                         IsDraft = request.IsDraft,
                         Id = request.Id
@@ -798,6 +804,34 @@ namespace GxPress.Service.Implement.Note
             result.DraftCount = await _noteRepository.GetDraftCountAsync(request.UserId, false);
             return result;
         }
+
+        public async Task<bool> UpdateNoteTextContentAsync()
+        {
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.Note.Note.TextContent), "=", "");
+            query.OrderByDesc(nameof(Entity.Note.Note.CreatedDate));
+            query.Limit(100);
+            var result = await _noteRepository.GetAllAsync(query);
+            foreach (var item in result)
+            {
+                if (!string.IsNullOrEmpty(item.Content))
+                {
+                    var contentJsonData = JsonConvert.DeserializeObject<List<ContentJsonData>>(item.Content);
+                    foreach (var data in contentJsonData)
+                    {
+                        if (data.Type == AllTypeConst.Text.GetHashCode())
+                            item.TextContent += data.Text;
+                    }
+                    if (!string.IsNullOrEmpty(item.TextContent))
+                        await _noteRepository.UpdateAsync(item);
+                    else{
+                        item.TextContent="[]";
+                        await _noteRepository.UpdateAsync(item);
+                    }
+                }
+            }
+            return true;
+        }
     }
 
 }

gx_api/GxPress/Service/GxPress.Service.Interface/Note/INoteService.cs

@@ -52,5 +52,6 @@ namespace GxPress.Service.Interface.Note
         /// <returns></returns>
         Task<PagedList<NoteNotFolderPageResult>> NoteTopicDraftPageListAsync(NoteSearchPageListRequest request);
         Task<bool> DraftDeleteAsync(int id);
+        Task<bool> UpdateNoteTextContentAsync();
     }
 }