11

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminThesaurusController.cs

@@ -1,20 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using GxPress.Auth;
 using GxPress.Common.Page;
 using GxPress.Entity;
 using GxPress.Repository.Interface;
-using GxPress.Request.Admin;
-using GxPress.Request.AppVersion;
 using GxPress.Request.Thesaurus;
-using GxPress.Result.Admin;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace GxPress.Api.AdminControllers
 {
@@ -26,9 +18,7 @@ namespace GxPress.Api.AdminControllers
     [Authorize]
     public class AdminThesaurusController : ControllerBase
     {
-
         private readonly IThesaurusRepository _thesaurusRepository;
-
         public AdminThesaurusController(IThesaurusRepository thesaurusRepository)
         {
             _thesaurusRepository = thesaurusRepository;
@@ -39,7 +29,6 @@ namespace GxPress.Api.AdminControllers
         /// <param name="request">参数</param>
         /// <returns></returns>
         [HttpPut("add")]
-        [AllowAnonymous]
         public async Task<bool> InThesaurus([FromBody] ThesaurusInRequest request)
         {
             if (!string.IsNullOrEmpty(request.ThesaurusName) && request.ThesaurusName.Length > 500)
@@ -56,8 +45,7 @@ namespace GxPress.Api.AdminControllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("page")]
-        [AllowAnonymous]
-        public async Task<PagedList<Thesaurus>> GetPagedList([FromBody]ThesaurusPageSearchRequest request)
+        public async Task<PagedList<Thesaurus>> GetPagedList([FromBody] ThesaurusPageSearchRequest request)
         {
             return await _thesaurusRepository.GetPageList(request);
         }
@@ -73,6 +61,16 @@ namespace GxPress.Api.AdminControllers
             return await _thesaurusRepository.DeleteAsync(id);
         }
         /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpDelete("delete")]
+        public async Task<bool> Deletes(List<int> ids)
+        {
+            return await _thesaurusRepository.DeleteAsync(ids);
+        }
+        /// <summary>
         /// 详情
         /// </summary>
         /// <param name="id"></param>
@@ -90,7 +88,7 @@ namespace GxPress.Api.AdminControllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPut("{id}")]
-        public async Task<bool> Update(int id, [FromBody] Thesaurus request)
+        public async Task<bool> Update(int id, [FromBody] ThesaurusUpdateRequest request)
         {
             if (!string.IsNullOrEmpty(request.ThesaurusName) && request.ThesaurusName.Length > 500)
             {

gx_api/GxPress/Model/GxPress.Entity/Thesaurus.cs

@@ -10,7 +10,7 @@ namespace GxPress.Entity
     /// 词库
     /// </summary>
     [DataTable("tede_thesaurus")]
-    public  class Thesaurus:Datory.Entity
+    public class Thesaurus : Datory.Entity
     {
         /// <summary>
         /// 词库类型 1 热词 2 冷词
@@ -22,5 +22,11 @@ namespace GxPress.Entity
         /// </summary>
         [DataColumn]
         public string ThesaurusName { get; set; }
+        /// <summary>
+        /// 是否禁用
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public bool IsDisable { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Request/Thesaurus/ThesaurusPageSearchRequest.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using GxPress.Common.Page;
 
 namespace GxPress.Request.Thesaurus
@@ -8,7 +5,7 @@ namespace GxPress.Request.Thesaurus
     /// <summary>
     /// 词库分页查询
     /// </summary>
-   public class ThesaurusPageSearchRequest:PageParameter
+    public class ThesaurusPageSearchRequest : PageParameter
     {
         /// <summary>
         /// 词库类型
@@ -19,4 +16,31 @@ namespace GxPress.Request.Thesaurus
         /// </summary>
         public string ThesaurusName { get; set; }
     }
+    /// <summary>
+    /// 修改
+    /// </summary>
+    public class ThesaurusUpdateRequest
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 词库类型 1 热词 2 冷词
+        /// </summary>
+
+        public int ThesaurusType { get; set; }
+        /// <summary>
+        /// 词库名称
+        /// </summary>
+
+        public string ThesaurusName { get; set; }
+        /// <summary>
+        /// 是否禁用 1 设置 2未设置
+        /// </summary>
+        /// <value></value>
+
+        public int IsDisable { get; set; }
+    }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/ThesaurusRepository.cs

@@ -139,13 +139,17 @@ namespace GxPress.Repository.Implement
         {
             return await _repository.DeleteAsync(id);
         }
+        public async Task<bool> DeleteAsync(List<int> ids)
+        {
+            return await _repository.DeleteAsync(Q.WhereIn(nameof(Entity.Thesaurus.Id), ids)) > 0;
+        }
 
         public async Task<Thesaurus> GetDetailAsync(int id)
         {
             return await _repository.GetAsync(id);
         }
 
-        public async Task<bool> UpdateAsync(int id, Thesaurus request)
+        public async Task<bool> UpdateAsync(int id, ThesaurusUpdateRequest request)
         {
             var thesaurus = await GetAsync(id);
             if (thesaurus == null)
@@ -154,6 +158,8 @@ namespace GxPress.Repository.Implement
                 thesaurus.ThesaurusName = request.ThesaurusName;
             if (request.ThesaurusType > 0)
                 thesaurus.ThesaurusType = request.ThesaurusType;
+            if (request.IsDisable > 0)
+                thesaurus.IsDisable = request.IsDisable == 1;
             return await _repository.UpdateAsync(thesaurus);
         }
     }

gx_api/GxPress/Repository/GxPress.Repository.Interface/IThesaurusRepository.cs

@@ -18,7 +18,7 @@ namespace GxPress.Repository.Interface
 
         Task<bool> InsertAsync(Thesaurus thesaurus);
 
-        Task<bool> UpdateAsync(Thesaurus thesaurus);
+    
 
         Task<IEnumerable<Thesaurus>> GetPageListAsync(ThesaurusPageSearchRequest request);
 
@@ -29,6 +29,8 @@ namespace GxPress.Repository.Interface
         Task<bool> DeleteAsync(int id);
 
         Task<Thesaurus> GetDetailAsync(int id);
-        Task<bool> UpdateAsync(int id,Thesaurus request);
+        Task<bool> UpdateAsync(int id,ThesaurusUpdateRequest request);
+
+        Task<bool> DeleteAsync(List<int> ids);
     }
 }