Dun.Jason il y a 1 an
Parent
commit
9738f09e3a

+ 2 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -2085,7 +2085,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);

+ 8 - 3
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;
@@ -42,6 +43,7 @@ namespace Hotline.Api.Controllers
         private readonly ISessionContext _sessionContext;
         private readonly ISystemDicDataCacheManager _systemDicDataCacheManager;
         private readonly IRepository<SystemLog> _systemLogRepository;
+        private readonly IRepository<MessageTemplate> _messageTemplateRepository;
 
         /// <summary>
         /// 系统管理相关接口
@@ -68,7 +70,8 @@ namespace Hotline.Api.Controllers
             IRepository<SystemCommonOpinion> commonOpinionRepository,
             ISessionContext sessionContext,
             ISystemDicDataCacheManager systemDicDataCacheManager,
-            IRepository<SystemLog> systemLogRepository
+            IRepository<SystemLog> systemLogRepository,
+            IRepository<MessageTemplate> messageTemplateRepository
 			)
         {
             _mapper = mapper;
@@ -83,6 +86,7 @@ namespace Hotline.Api.Controllers
             _sessionContext = sessionContext;
             _systemDicDataCacheManager = systemDicDataCacheManager;
             _systemLogRepository = systemLogRepository;
+            _messageTemplateRepository = messageTemplateRepository;
 
 		}
 
@@ -575,6 +579,7 @@ namespace Hotline.Api.Controllers
 		}
 
 
-		#endregion
-	}
+        #endregion
+
+    }
 }

+ 1 - 2
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"));
     }
 

+ 34 - 0
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
+    {
+
+    }
+
 }