Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -2076,7 +2076,8 @@ public class OrderController : BaseController
                         $"温馨提示：您的来电已受理（流水号：{order.No}；提取码：{order.Password}，可通过网站（http://hotline.12345lm.cn）进行查询，谢谢。【宜宾12345热线平台】）",
                     Remark = order.Title,
                     Name = order.FromName,
-                    TelNumber = order.Contact
+                    TelNumber = order.Contact,
+                    
                 };
                 await _mediator.Publish(new PushMessageNotify(messageDto), HttpContext.RequestAborted);
                 //await _pushDomainService.PushAsync(MessageDto, HttpContext.RequestAborted);

src/Hotline.Api/Controllers/SysController.cs

@@ -17,6 +17,7 @@ using Hotline.Share.Requests;
 using MapsterMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using System.Diagnostics.CodeAnalysis;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
@@ -575,6 +576,7 @@ namespace Hotline.Api.Controllers
 		}
 
 
-		#endregion
-	}
+        #endregion
+
+    }
 }

src/Hotline.Api/Controllers/TemplateDomainController.cs

@@ -34,6 +34,10 @@ namespace Hotline.Api.Controllers
         [HttpPut("add")]
         public async Task<string> AddTemplate([FromBody] TemplateDto dto)
         {
+            var data = await _messageTemplateRepository.GetAsync(p => p.Code == dto.Code, HttpContext.RequestAborted);
+            if (data != null)
+                throw UserFriendlyException.SameMessage("存在相同Code！");
+
             var template = _mapper.Map<MessageTemplate>(dto);
 
             Regex regex = new(@"\{[a-zA-Z0-9]{1,}\}");
@@ -47,10 +51,6 @@ namespace Hotline.Api.Controllers
                 list.Add(matches[i].ToString());
             }
 
-            var data = await _messageTemplateRepository.GetAsync(p => p.Code == template.Code, HttpContext.RequestAborted);
-            if (data != null)
-                throw UserFriendlyException.SameMessage("存在相同Code！");
-
             return await _messageTemplateRepository.AddAsync(template, HttpContext.RequestAborted);
         }
 
@@ -62,10 +62,16 @@ namespace Hotline.Api.Controllers
         [HttpPut("update")]
         public async Task UpdateTemplate([FromBody] UpdateTemplateDto dto)
         {
-            var template = _mapper.Map<MessageTemplate>(dto);
+            var model =await _messageTemplateRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
+            if (model.Code!=dto.Code)
+                throw UserFriendlyException.SameMessage("不能修改编码");
+
+            _mapper.Map(dto,model);
+
+
 
             Regex regex = new(@"\{[a-zA-Z0-9]{1,}\}");
-            var matches = regex.Matches(template.Content);
+            var matches = regex.Matches(model.Content);
             List<string> list = new List<string>();
             for (int i = 0; i < matches.Count; i++)
             {
@@ -75,23 +81,10 @@ namespace Hotline.Api.Controllers
                 list.Add(matches[i].ToString());
             }
 
-            var data = await _messageTemplateRepository.GetAsync(p => p.Code == template.Code && p.Id != template.Id, HttpContext.RequestAborted);
-            if (data != null)
-                throw UserFriendlyException.SameMessage("存在相同Code！");
-
-            await _messageTemplateRepository.UpdateAsync(template, HttpContext.RequestAborted);
+            await _messageTemplateRepository.UpdateAsync(model, HttpContext.RequestAborted);
         }
 
-        /// <summary>
-        /// 删除
-        /// </summary>
-        /// <param name="Id"></param>
-        /// <returns></returns>
-        [HttpDelete("remove")]
-        public async Task RemoveType(string Id)
-        {
-            await _messageTemplateRepository.RemoveAsync(Id, false, HttpContext.RequestAborted);
-        }
+
 
         /// <summary>
         /// 查询详情
@@ -118,7 +111,7 @@ namespace Hotline.Api.Controllers
             var (total, items) = await _messageTemplateRepository
                     .Queryable()
                     .WhereIF(!string.IsNullOrEmpty(pagedDto.Keyword), d => d.Code.Contains(pagedDto.Keyword!) || d.Content.Contains(pagedDto.Keyword!))
-                    .WhereIF(pagedDto.PushBusiness.HasValue, d => d.PushBusiness == pagedDto.PushBusiness)
+                 
                     .OrderByDescending(it => it.CreationTime)
                     .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
 

src/Hotline.Api/Controllers/TestController.cs

@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.Data;
 using DotNetCore.CAP;
+using Fw.Utility.Client;
 using Hotline.CallCenter.BlackLists;
 using Hotline.CallCenter.Devices;
 using Hotline.CallCenter.Ivrs;
@@ -191,10 +192,8 @@ public class TestController : BaseController
         //var rsp = await _daprClient.InvokeMethodAsync<ApiResponse<string>>(HttpMethod.Get, "identity", "api/v1/Test/time", HttpContext.RequestAborted);
         //var rsp1 = await _daprClient.InvokeMethodAsync<int, ApiResponse<string>>(HttpMethod.Post, "identity", "api/v1/Test/time1", 222, HttpContext.RequestAborted);
         //var a = await _trClient.QueryTelsAsync(new Tr.Sdk.Tels.QueryTelRequest() { }, HttpContext.RequestAborted);
-
         //await _daySettingRepository.IsWorkDay(DateTime.Now);
 
-
         return OpenResponse.Ok(DateTime.Now.ToString("F"));
     }
 

src/Hotline.Share/Dtos/Push/TemplateDataDto.cs

@@ -1,6 +1,4 @@
-using Hotline.Share.Enums.Push;
-
-namespace Hotline.Share.Dtos.Push
+namespace Hotline.Share.Dtos.Push
 {
     public record TemplateDataDto
     {
@@ -9,11 +7,6 @@ namespace Hotline.Share.Dtos.Push
         /// </summary>
         public string Id { get; set; }
 
-        /// <summary>
-        /// 短信类型
-        /// </summary>
-        public EPushBusiness PushBusiness { get; set; }
-
         /// <summary>
         /// 短信Code
         /// </summary>
@@ -25,13 +18,9 @@ namespace Hotline.Share.Dtos.Push
         public string Content { get; set; }
 
         /// <summary>
-        /// 备注
+        ///名称
         /// </summary>
-        public string? Remark { get; set; }
+        public string Name { get; set; }
 
-        /// <summary>
-        /// 模板状态
-        /// </summary>
-        public bool Status { get; set; }
     }
 }

src/Hotline.Share/Dtos/Push/TemplateDto.cs

@@ -1,17 +1,10 @@
-using Hotline.Share.Enums.Push;
-
-namespace Hotline.Share.Dtos.Push
+namespace Hotline.Share.Dtos.Push
 {
     /// <summary>
     /// 
     /// </summary>
     public record TemplateDto
     {
-        /// <summary>
-        /// 短信类型
-        /// </summary>
-        public EPushBusiness PushBusiness { get; set; }
-
         /// <summary>
         /// 短信Code
         /// </summary>
@@ -23,14 +16,10 @@ namespace Hotline.Share.Dtos.Push
         public string Content { get; set; }
 
         /// <summary>
-        /// 备注
+        /// 名称
         /// </summary>
-        public string? Remark { get; set; }
+        public string Name { get; set; }
 
-        /// <summary>
-        /// 模板状态
-        /// </summary>
-        public bool Status { get; set; }
     }
 
     /// <summary>

src/Hotline.Share/Dtos/Push/TemplatePagedDto.cs

@@ -1,11 +1,9 @@
-using Hotline.Share.Enums.Push;
-using Hotline.Share.Requests;
+using Hotline.Share.Requests;
 
 namespace Hotline.Share.Dtos.Push
 {
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="PushBusiness"></param>
-    public record TemplatePagedDto(EPushBusiness? PushBusiness) : PagedKeywordRequest;
+    public record TemplatePagedDto() : PagedKeywordRequest;
 }

src/Hotline.Share/Dtos/Settings/CommonDto.cs

@@ -63,4 +63,38 @@ namespace Hotline.Share.Dtos.Settings
     }
 
 
+    public class AddMessageTemplateDto
+    {
+        public string TemplateName { get; set; }
+
+        public string TemplateCode { get; set; }
+
+        public string TemplateMsg { get; set; }
+    }
+
+    public class ModifyMessageTemplateDto:AddMessageTemplateDto
+    {
+        public string Id { get; set; }
+    }
+
+
+
+
+
+    public class MessageTemplateDto
+    {
+        public string TemplateName { get; set; }
+
+        public string TemplateCode { get; set; }
+
+        public string TemplateMsg { get; set; }
+
+        public DateTime CreationTime { get; set; }
+    }
+
+    public record QueryMessageTemplatePageListRequest: PagedKeywordRequest
+    {
+
+    }
+
 }

src/Hotline/Push/FWMessage/Message.cs

@@ -33,7 +33,7 @@ namespace Hotline.Push.FWMessage
         /// <summary>
         /// 推送平台
         /// </summary>
-        [SugarColumn(ColumnDescription = "推送平台"), IsNullable = true]
+        [SugarColumn(ColumnDescription = "推送平台", IsNullable = true)]
         public EPushPlatform? PushPlatform { get; set; } = EPushPlatform.Sms;
 
         /// <summary>

src/Hotline/Push/MessageTemplate.cs

@@ -6,11 +6,6 @@ namespace Hotline.Push
 {
     public class MessageTemplate : CreationModificationEntity
     {
-        /// <summary>
-        /// 短信类型
-        /// </summary>
-        public EPushBusiness PushBusiness { get; set; }
-
         /// <summary>
         /// 短信Code
         /// </summary>
@@ -22,14 +17,9 @@ namespace Hotline.Push
         public string Content { get; set; }
 
         /// <summary>
-        /// 备注
+        /// 名称
         /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string? Remark { get; set; }
+        public string Name { get; set; }
 
-        /// <summary>
-        /// 模板状态
-        /// </summary>
-        public bool Status { get; set; }
     }
 }