11

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.Auth;
 using GxPress.Common.Page;
@@ -139,10 +140,20 @@ namespace GxPress.Api.AppControllers
         /// </summary>
         /// <param name="typeValue">0 笔记 1 话题本</param>
         /// <returns></returns>
-        [HttpPut("clear-draft")]
-        public async Task<bool> ClearDraftAsync([FromQuery] int typeValue)
+        [HttpPut("clear-draft/{typeValue}")]
+        public async Task<bool> ClearDraftAsync(int typeValue)
         {
             return await noteRepository.ClearDraftAsync(_loginContext.AccountId, typeValue);
         }
+        /// <summary>
+        /// 草稿删除
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpDelete("draft/{id}")]
+        public async Task<bool> DraftDeleteAsync(int id)
+        {
+            return await _noteService.DraftDeleteAsync(id);
+        }
     }
 }

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebNoteController.cs

@@ -157,5 +157,15 @@ namespace GxPress.Api.WebControllers
             request.UserId = _loginContext.AccountId;
             return await _noteService.NoteTopicDraftPageListAsync(request);
         }
+        /// <summary>
+        /// 清空草稿箱
+        /// </summary>
+        /// <param name="typeValue">0 笔记 1 话题本</param>
+        /// <returns></returns>
+        [HttpPut("clear-draft")]
+        public async Task<bool> ClearDraftAsync([FromQuery] int typeValue)
+        {
+            return await noteRepository.ClearDraftAsync(_loginContext.AccountId, typeValue);
+        }
     }
 }

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

@@ -659,6 +659,26 @@ namespace GxPress.Service.Implement.Note
             }
             return true;
         }
+
+        public async Task<bool> DraftDeleteAsync(int id)
+        {
+            try
+            {
+                using (var transactionScope = new TransactionScope())
+                {
+                    //修改笔记
+                    await _noteRepository.DeleteAsync(Q.Where(nameof(Entity.Note.Note.Id), id));
+                    transactionScope.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
+
+
         /// <summary>
         /// 查询个人摘录
         /// </summary>

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

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