qinchaoyue пре 8 месеци
родитељ
комит
45d701d35c

+ 2 - 2
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -65,7 +65,7 @@ namespace Hotline.Api.Controllers.Bi
         private readonly IRepository<Hotspot> _hotspotRepository;
         private readonly IRepository<SystemDicData> _systemDicDataRepository;
         private readonly ISystemDicDataCacheManager _systemDicDataCacheManager;
-        private readonly IExpireTime _expireTime;
+        private readonly ICalcExpireTime _expireTime;
         private readonly IWorkflowApplication _workflowApplication;
 
         public BiOrderController(
@@ -97,7 +97,7 @@ namespace Hotline.Api.Controllers.Bi
             ISystemDicDataCacheManager systemDicDataCacheManager,
             IRepository<WorkflowStep> workflowStepRepository,
             IWorkflowApplication workflowApplication,
-            IExpireTime expireTime)
+            ICalcExpireTime expireTime)
         {
             _orderRepository = orderRepository;
             _hotspotTypeRepository = hotspotTypeRepository;

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

@@ -126,7 +126,7 @@ public class OrderController : BaseController
     private readonly IOrderSendBackAuditApplication _orderSendBackAuditApplication;
     private readonly Publisher _publisher;
     private readonly IOrderAnalysisApplication _orderAnalysisApplication;
-    private readonly IExpireTime _expireTime;
+    private readonly ICalcExpireTime _expireTime;
 
     public OrderController(
         IOrderDomainService orderDomainService,
@@ -186,7 +186,7 @@ public class OrderController : BaseController
         IOrderSendBackAuditApplication orderSendBackAuditApplication,
         Publisher publisher,
         IOrderAnalysisApplication orderAnalysisApplication,
-        IExpireTime expireTime)
+        ICalcExpireTime expireTime)
     {
         _orderDomainService = orderDomainService;
         _orderRepository = orderRepository;

+ 2 - 2
src/Hotline.Api/Controllers/TestController.cs

@@ -118,7 +118,7 @@ public class TestController : BaseController
     private readonly ICallApplication _callApplication;
     //private readonly ITypedCache<List<User>> _cache;
     //private readonly ICacheManager<User> _cache;
-    private readonly IExpireTime _expireTime;
+    private readonly ICalcExpireTime _expireTime;
 
 
     public TestController(
@@ -169,7 +169,7 @@ IRepository<Hotspot> hotspotRepository,
 IOrderDomainService orderDomainService,
 ICallApplication callApplication
 ,
-IExpireTime expireTime)
+ICalcExpireTime expireTime)
     {
         _logger = logger;
         //_authorizeGenerator = authorizeGenerator;

+ 2 - 2
src/Hotline.Application/Handlers/FlowEngine/WorkflowEndHandler.cs

@@ -44,7 +44,7 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
     private readonly IOptionsSnapshot<AppConfiguration> _appOptions;
     private readonly ISystemSettingCacheManager _systemSettingCacheManager;
     private readonly Publisher _publisher;
-    private readonly IExpireTime _expireTime;
+    private readonly ICalcExpireTime _expireTime;
 
     public WorkflowEndHandler(
         IMapper mapper,
@@ -63,7 +63,7 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
         Publisher publisher,
         ILogger<WorkflowEndHandler> logger
 ,
-        IExpireTime expireTime)
+        ICalcExpireTime expireTime)
     {
         _mapper = mapper;
         _knowledgeDomainService = knowledgeDomainService;

+ 2 - 2
src/Hotline.Application/Orders/OrderApplication.cs

@@ -85,7 +85,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     private readonly IRepository<OrderPublish> _orderPublishRepository;
     private readonly IRepository<OrderScreen> _orderScreenRepository;
     private readonly IRepository<OrderSendBackAudit> _orderSendBackAuditRepository;
-    private readonly IExpireTime _expireTime;
+    private readonly ICalcExpireTime _expireTime;
 
 
     public OrderApplication(
@@ -114,7 +114,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         IRepository<OrderPublish> orderPublishRepository,
         IRepository<OrderScreen> orderScreenRepository,
         IRepository<OrderSendBackAudit> orderSendBackAuditRepository,
-        IExpireTime expireTime)
+        ICalcExpireTime expireTime)
     {
         _orderDomainService = orderDomainService;
         _workflowDomainService = workflowDomainService;

+ 2 - 2
src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs

@@ -36,7 +36,7 @@ namespace Hotline.Application.Orders
         private readonly ISessionContext _sessionContext;
         private readonly IOrderRepository _orderRepository;
         private readonly ITimeLimitDomainService _timeLimitDomainService;
-        private readonly IExpireTime _expireTime;
+        private readonly ICalcExpireTime _expireTime;
         private readonly ICapPublisher _capPublisher;
         private readonly IWorkflowApplication _workflowApplication;
         private readonly IRepository<OrderPublish> _orderPublishRepository;
@@ -61,7 +61,7 @@ namespace Hotline.Application.Orders
             IRepository<OrderVisitDetail> orderVisitedDetailRepository,
             IOrderDomainService orderDomainService
 ,
-            IExpireTime expireTime)
+            ICalcExpireTime expireTime)
         {
             _mapper = mapper;
             _orderSecondaryHandlingRepository = orderSecondaryHandlingRepository;

+ 2 - 1
src/Hotline/Settings/TimeLimitDomain/ExpireTimeHandler.cs

@@ -1,9 +1,10 @@
 using Hotline.Settings.TimeLimits;
 using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Enums.Settings;
+using XF.Domain.Dependency;
 
 namespace Hotline.Settings.TimeLimitDomain;
-public class ExpireTimeHandler : IExpireTimeHandler
+public class ExpireTimeHandler : IExpireTimeHandler, IScopeDependency
 {
     private readonly IDaySettingRepository _daySettingRepository;
 

+ 1 - 1
src/Hotline/Settings/TimeLimitDomain/ExpireTimeLimitBase.cs

@@ -13,7 +13,7 @@ namespace Hotline.Settings.TimeLimitDomain;
 /// <summary>
 /// 过期时间处理基类
 /// </summary>
-public abstract class ExpireTimeLimitBase : IExpireTime
+public abstract class ExpireTimeLimitBase 
 {
     private readonly ISystemSettingCacheManager _systemSettingCacheManager;
     private readonly IRepository<TimeLimitSetting> _timeLimitSettingRepository;

+ 1 - 1
src/Hotline/Settings/TimeLimitDomain/IExpireTime.cs → src/Hotline/Settings/TimeLimitDomain/ICalcExpireTime.cs

@@ -4,7 +4,7 @@ using Hotline.Share.Enums.Settings;
 using XF.Domain.Dependency;
 
 namespace Hotline.Settings.TimeLimitDomain;
-public interface IExpireTime : IScopeDependency
+public interface ICalcExpireTime
 {
     public Task<TimeResult?> CalcEndTime(DateTime beginTime, ETimeType timeType, int timeValue, string busCode);
 

+ 1 - 1
src/Hotline/Settings/TimeLimitDomain/IExpireTimeHandler.cs

@@ -3,7 +3,7 @@ using Hotline.Share.Enums.Settings;
 using XF.Domain.Dependency;
 
 namespace Hotline.Settings.TimeLimitDomain;
-public interface IExpireTimeHandler : IScopeDependency
+public interface IExpireTimeHandler 
 {
     /// <summary>
     /// 计算工作时间分钟数

+ 2 - 1
src/Hotline/Settings/TimeLimitDomain/YBExpireTimeLimit.cs

@@ -5,6 +5,7 @@ using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Settings;
 using MapsterMapper;
 using System.Runtime.CompilerServices;
+using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using XF.Utility.EnumExtensions;
@@ -14,7 +15,7 @@ namespace Hotline.Settings.TimeLimitDomain;
 /// <summary>
 /// 宜宾过期时间计算
 /// </summary>
-public class YBExpireTimeLimit : ExpireTimeLimitBase, IExpireTime
+public class YBExpireTimeLimit : ExpireTimeLimitBase, ICalcExpireTime, IScopeDependency
 {
     private readonly ISystemSettingCacheManager _systemSettingCacheManager;
     private readonly IRepository<TimeLimitSetting> _timeLimitSettingRepository;

+ 8 - 8
src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -80,7 +80,7 @@ namespace Hotline.Settings.TimeLimits
         /// <summary>
         /// 获取办理时限配置
         /// 2024-08-28 过期了,不再使用和维护;
-        /// 请调用 <inheritdoc cref="IExpireTime.GetOrderTimeLimitConfig"/>IExpireTime.GetOrderTimeLimitConfig
+        /// 请调用 <inheritdoc cref="ICalcExpireTime.GetOrderTimeLimitConfig"/>IExpireTime.GetOrderTimeLimitConfig
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
@@ -118,7 +118,7 @@ namespace Hotline.Settings.TimeLimits
 
         /// <summary>
         /// 2024-08-28 过期了,不再使用和维护;
-        /// 请调用 <inheritdoc cref="IExpireTime.CalcEndTime"/>IExpireTime.CalcEndTime
+        /// 请调用 <inheritdoc cref="ICalcExpireTime.CalcEndTime"/>IExpireTime.CalcEndTime
         /// </summary>
         /// <param name="flowDirection"></param>
         /// <param name="Percentage"></param>
@@ -148,7 +148,7 @@ namespace Hotline.Settings.TimeLimits
         /// <summary>
         /// 计算期满时间
         /// 2024-08-28 过期了,不再使用和维护;
-        /// 请调用 <inheritdoc cref="IExpireTime.CalcExpiredTime"/>IExpireTime.CalcExpiredTime
+        /// 请调用 <inheritdoc cref="ICalcExpireTime.CalcExpiredTime"/>IExpireTime.CalcExpiredTime
         /// </summary>
         [Obsolete("新的方法 -> IExpireTime.CalcExpiredTime")]
         public ExpiredTimeWithConfig CalcExpiredTime(DateTime beginTime, EFlowDirection flowDirection, string? acceptTypeCode)
@@ -169,7 +169,7 @@ namespace Hotline.Settings.TimeLimits
         /// <summary>
         /// 计算工作时间天数
         /// 2024-08-28 过期了,不再使用和维护;
-        /// 请调用 <inheritdoc cref="IExpireTime.CalcWorkTimeToDecimal"/>IExpireTime.CalcWorkTimeToDecimal
+        /// 请调用 <inheritdoc cref="ICalcExpireTime.CalcWorkTimeToDecimal"/>IExpireTime.CalcWorkTimeToDecimal
         /// </summary>
         /// <param name="beginTime"></param>
         /// <param name="endTime"></param>
@@ -209,7 +209,7 @@ namespace Hotline.Settings.TimeLimits
         /// <summary>
         /// 计算工作时间小时
         /// 2024-08-28 过期了,不再使用和维护;
-        /// 请调用 <inheritdoc cref="IExpireTime.CalcWorkTimeToHour"/>IExpireTime.CalcWorkTimeToHour
+        /// 请调用 <inheritdoc cref="ICalcExpireTime.CalcWorkTimeToHour"/>IExpireTime.CalcWorkTimeToHour
         /// </summary>
         /// <param name="beginTime"></param>
         /// <param name="endTime"></param>
@@ -250,7 +250,7 @@ namespace Hotline.Settings.TimeLimits
         /// <summary>
         /// 计算工作时间分钟数(已改返回秒)
         /// 2024-08-28 过期了,不再使用和维护;
-        /// 请调用 <inheritdoc cref="IExpireTime.CalcWorkTime"/>IExpireTime.CalcWorkTimeToHour
+        /// 请调用 <inheritdoc cref="ICalcExpireTime.CalcWorkTime"/>IExpireTime.CalcWorkTimeToHour
         /// </summary>
         /// <param name="beginTime"></param>
         /// <param name="endTime"></param>
@@ -442,7 +442,7 @@ namespace Hotline.Settings.TimeLimits
         /// <summary>
         /// 计算工作时间分钟数(已改返回秒)
         /// 2024-08-28 过期了,不再使用和维护;
-        /// 请调用 <inheritdoc cref="IExpireTime.CalcWorkTimeEx"/>IExpireTime.CalcWorkTimeEx
+        /// 请调用 <inheritdoc cref="ICalcExpireTime.CalcWorkTimeEx"/>IExpireTime.CalcWorkTimeEx
         /// </summary>
         /// <param name="beginTime"></param>
         /// <param name="endTime"></param>
@@ -676,7 +676,7 @@ namespace Hotline.Settings.TimeLimits
         /// <summary>
         /// 计算工作日
         /// 2024-08-28 过期了,不再使用和维护;
-        /// 请调用 <inheritdoc cref="IExpireTime.CalcEndTime"/>IExpireTime.CalcEndTime
+        /// 请调用 <inheritdoc cref="ICalcExpireTime.CalcEndTime"/>IExpireTime.CalcEndTime
         /// </summary>
         /// <param name="beginTime"></param>
         /// <param name="busCode"></param>