src/DataSharing.Application/Mappers/LZ110MapperRegisters.cs

@@ -1,4 +1,4 @@
-using DataSharing.LuZhou.LZ110;
+using DataSharing.Share.Dtos.LuZhou;
 using Mapster;
 
 namespace DataSharing.Application.Mappers

src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -675,20 +675,16 @@ namespace DataSharing.Application.Receivers
             }
 
             //泸州110推送
-            try
+            if (_sharingConfigurationManager.IsCity(ConfigurationConsts.LuZhou))
             {
-                //泸州110推送
-                if (_sharingConfigurationManager.IsCity(ConfigurationConsts.LuZhou))
+                try
                 {
                     if (dto.Order.TransferPhone == "12345")
-                    {
                         await _luZhou110Service.InitData(dto, cancellationToken);
-
-                    }
                 }
-            }
-            catch (Exception)
-            {
+                catch (Exception)
+                {
+                }
             }
         }
 

src/DataSharing.Host/StartupExtensions.cs

@@ -1,5 +1,6 @@
 using DataSharing.CityStateDataExchange;
 using DataSharing.LuZhou;
+using DataSharing.LuZhou.LuZhou110;
 using DataSharing.Police110;
 using DataSharing.Police110.DaoShu110;
 using DataSharing.Police110.DCJT110;
@@ -68,7 +69,7 @@ internal static class StartupExtensions
         else if (sharingConfig != null && sharingConfig.CityCode == ConfigurationConsts.LuZhou)//泸州
         {
             services.AddScoped<ISendTaskDataService, DataSharing.LuZhou.LuZhouSendTaskDataService>();
-            // services.AddScoped<IPoliceService, DaoShuService>();//110 
+             services.AddScoped<IPoliceService, DaoShuService>();//110 
             services.AddScoped<ICityStateDataExchangeService, CityStateDataExchangeService>();//市州互转
             services.AddScoped<ILuZhou110Service, LuZhou110Service>();//泸州110
         }

src/DataSharing.Host/StartupHelper.cs

@@ -1,4 +1,5 @@
-using DataSharing.Province.SendTask;
+using DataSharing.LuZhou.LuZhou110;
+using DataSharing.Province.SendTask;
 using DataSharing.Repository;
 using DataSharing.SendTask;
 using Mapster;
@@ -273,6 +274,16 @@ namespace DataSharing.Host
                     .WithCronSchedule("0/30 * * * * ? ")
                 );
 
+                //泸州110推送工单
+                var taskSendTaskLuZhou110Key = new JobKey("task-send-luzhou110-job", "task send luzhou110 job");
+                d.AddJob<TaskSendTaskLuZhou110Job>(taskSendTaskLuZhou110Key);
+                d.AddTrigger(t => t
+                    .WithIdentity("task-send-luzhou110-trigger")
+                    .ForJob(taskSendTaskLuZhou110Key)
+                    .StartNow()
+                    .WithCronSchedule("0/30 * * * * ? ")
+                );
+
                 ////execute send task
                 //var taskExecuteJobKey = new JobKey("task-execute-job", "send task");
                 //d.AddJob<TaskExecuteJob>(taskExecuteJobKey);

src/DataSharing.Host/config/appsettings.Development.json

@@ -44,7 +44,7 @@
     }
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": false,
+    "ApplyDbMigrations": true,
     "ApplySeed": false
   },
   "MqConfiguration": {
@@ -102,7 +102,7 @@
 
   //地市系统配置
   "SharingConfiguration": {
-    "CityCode": "510300", //系统市州编码 
+    "CityCode": "510500", //系统市州编码 
     "CityName": "宜宾市", //系统市州名称
     "HotlineName": "宜宾12345",
     "ProvinceOrgCode": "001171", //省12345平台部门Code

src/DataSharing.LuZhou/LuZhou110Service.cs

@@ -8,17 +8,25 @@ using MapsterMapper;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using SqlSugar;
+using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
 namespace DataSharing.LuZhou
 {
-    public class LuZhou110Service : ILuZhou110Service
+    public class LuZhou110Service : ILuZhou110Service, IScopeDependency
     {
         private readonly IMapper _mapper;
         private readonly ILogger<LuZhou110Service> _logger;
         private readonly IRepository<WaitSendTaskLuZhou110> _waitSendTaskLuZhou110Repository;
         private readonly IRepository<SendTaskLuZhou110> _sendTaskLuZhou110Repository;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="mapper"></param>
+        /// <param name="logger"></param>
+        /// <param name="waitSendTaskLuZhou110Repository"></param>
+        /// <param name="sendTaskLuZhou110Repository"></param>
         public LuZhou110Service(IMapper mapper, ILogger<LuZhou110Service> logger,
             IRepository<WaitSendTaskLuZhou110> waitSendTaskLuZhou110Repository,
             IRepository<SendTaskLuZhou110> sendTaskLuZhou110Repository

src/DataSharing.LuZhou/LuZhouSendTaskDataService.cs

@@ -47,6 +47,7 @@ namespace DataSharing.LuZhou
             switch (dto.PlatformSource)
             {
                 case Share.Enums.EPlatformSource.Police110:
+                    //调用推送服务
                     break;
                 //case Share.Enums.EPlatformSource.CityDataExchange:
                 //    await _dataExchangePusherProviderService.SendDataExchangeDataPusher(dto, cancellationToken);

src/DataSharing.LuZhou/LZ110/ApiResponse.cs → src/DataSharing.Share/Dtos/LuZhou/ApiResponse.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DataSharing.LuZhou.LZ110
+namespace DataSharing.Share.Dtos.LuZhou
 {
     public record LZ110ApiResponse
     {

src/DataSharing.LuZhou/LZ110/LZ110BaseResponse.cs → src/DataSharing.Share/Dtos/LuZhou/LZ110BaseResponse.cs

@@ -1,4 +1,4 @@
-namespace DataSharing.LuZhou.LZ110
+namespace DataSharing.Share.Dtos.LuZhou
 {
     public record LZ110BaseResponse
     {

src/DataSharing.LuZhou/LZ110/IDataShareRequest.cs → src/DataSharing/LuZhou/LuZhou110/IDataShareRequest.cs

@@ -1,4 +1,4 @@
-namespace DataSharing.LuZhou.LZ110
+namespace DataSharing.LuZhou.LuZhou110
 {
     public interface IDataShareRequest
     {

src/DataSharing/LuZhou/LuZhou110/ILZ110RegisterManager.cs

@@ -0,0 +1,7 @@
+namespace DataSharing.LuZhou.LuZhou110
+{
+    public interface ILZ110RegisterManager
+    {
+        Task RefreshRegisterAsync(CancellationToken cancellationToken);
+    }
+}

src/DataSharing.LuZhou/LZ110/ILZ110RequestBase.cs → src/DataSharing/LuZhou/LuZhou110/ILZ110RequestBase.cs

@@ -1,4 +1,4 @@
-namespace DataSharing.LuZhou.LZ110
+namespace DataSharing.LuZhou.LuZhou110
 {
     public interface ILZ110RequestBase<TResponse> : IDataShareRequest<TResponse>
     {

src/DataSharing.LuZhou/LZ110/JsonPascalNamingPolicy.cs → src/DataSharing/LuZhou/LuZhou110/JsonPascalNamingPolicy.cs

@@ -1,6 +1,6 @@
 using System.Text.Json;
 
-namespace DataSharing.LuZhou.LZ110
+namespace DataSharing.LuZhou.LuZhou110
 {
     public class JsonPascalNamingPolicy : JsonNamingPolicy
     {

src/DataSharing.LuZhou/LZ110/LZ110Invoker.cs → src/DataSharing/LuZhou/LuZhou110/LZ110Invoker.cs

@@ -1,30 +1,27 @@
-using MapsterMapper;
+using DataSharing.Share.Dtos.LuZhou;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Org.BouncyCastle.Asn1.Ocsp;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Text;
 using System.Text.Json;
+using XF.Domain.Dependency;
 
-namespace DataSharing.LuZhou.LZ110
+namespace DataSharing.LuZhou.LuZhou110
 {
-    public class LZ110Invoker
+    public class LZ110Invoker : ISingletonDependency, ISelfDependency
     {
         private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IMapper _mapper;
+        private readonly IServiceScopeFactory _scopeFactory;
         private readonly ILogger<LZ110Invoker> _logger;
-        private readonly ISharingConfigurationManager _sharingConfigurationManager;
 
         public LZ110Invoker(
             IHttpClientFactory httpClientFactory,
-            IMapper mapper,
-            ILogger<LZ110Invoker> logger,
-           ISharingConfigurationManager sharingConfigurationManager)
+            ILogger<LZ110Invoker> logger, IServiceScopeFactory scopeFactory)
         {
             _httpClientFactory = httpClientFactory;
-            _mapper = mapper;
             _logger = logger;
-            _sharingConfigurationManager = sharingConfigurationManager;
+            _scopeFactory = scopeFactory;
         }
 
         public async Task<LZ110ApiResponse<TResponse>> InvokeAsync<TRequest, TResponse>(TRequest request,
@@ -32,7 +29,12 @@ namespace DataSharing.LuZhou.LZ110
             where TRequest : ILZ110RequestBase<TResponse>
             where TResponse : class
         {
+            using var scope = _scopeFactory.CreateScope();
+            var provider = scope.ServiceProvider;
+            var httpInvoker = provider.GetRequiredService<IHttpInvoker>();
+
             using var client = _httpClientFactory.CreateClient();
+            var _sharingConfigurationManager = provider.GetRequiredService<ISharingConfigurationManager>();
             client.BaseAddress = new Uri(_sharingConfigurationManager.GetLuZhouConfig().LuZhou110.SendDataAddress);
             client.DefaultRequestHeaders.Add("User-Identify", "12345rexian");
             var serializeOptions = new JsonSerializerOptions
@@ -62,7 +64,13 @@ namespace DataSharing.LuZhou.LZ110
         /// <returns></returns>
         public async Task<LZ110ApiResponse<TResponse>> RequestStringContentAsync<TResponse>(string url, string? stringContent = null, CancellationToken cancellationToken = default)
         {
+            using var scope = _scopeFactory.CreateScope();
+            var provider = scope.ServiceProvider;
+            var httpInvoker = provider.GetRequiredService<IHttpInvoker>();
             using var client = _httpClientFactory.CreateClient();
+
+            var _sharingConfigurationManager = provider.GetRequiredService<ISharingConfigurationManager>();
+
             client.BaseAddress = new Uri(_sharingConfigurationManager.GetLuZhouConfig().LuZhou110.SendDataAddress);
             client.DefaultRequestHeaders.Add("User-Identify", "12345rexian");
             var serializeOptions = new JsonSerializerOptions

src/DataSharing.LuZhou/LZ110/LZ110RegisterManager.cs → src/DataSharing/LuZhou/LuZhou110/LZ110RegisterManager.cs

@@ -1,6 +1,9 @@
-namespace DataSharing.LuZhou.LZ110
+using DataSharing.Share.Dtos.LuZhou;
+using XF.Domain.Dependency;
+
+namespace DataSharing.LuZhou.LuZhou110
 {
-    public class LZ110RegisterManager
+    public class LZ110RegisterManager: ILZ110RegisterManager, IScopeDependency
     {
         private readonly LZ110Invoker _invoker;
 

src/DataSharing.LuZhou/LZ110/LZ110RegisterRequest.cs → src/DataSharing/LuZhou/LuZhou110/LZ110RegisterRequest.cs

@@ -1,4 +1,6 @@
-namespace DataSharing.LuZhou.LZ110
+using DataSharing.Share.Dtos.LuZhou;
+
+namespace DataSharing.LuZhou.LuZhou110
 {
     public class LZ110RegisterRequest : ILZ110RequestBase<LZ110BaseResponse>
     {

src/DataSharing.LuZhou/LZ110/LZ110UnRegisterRequest.cs → src/DataSharing/LuZhou/LuZhou110/LZ110UnRegisterRequest.cs

@@ -1,4 +1,6 @@
-namespace DataSharing.LuZhou.LZ110
+using DataSharing.Share.Dtos.LuZhou;
+
+namespace DataSharing.LuZhou.LuZhou110
 {
     public class LZ110UnRegisterRequest : ILZ110RequestBase<LZ110BaseResponse>
     {

src/DataSharing/LuZhou/LuZhou110/TaskSendTaskLuZhou110Job.cs

@@ -0,0 +1,176 @@
+using DataSharing.SendTask;
+using DataSharing.Share.Dtos.LuZhou;
+using DataSharing.Share.Enums;
+using MapsterMapper;
+using Microsoft.Extensions.Logging;
+using Quartz;
+using XF.Domain.Repository;
+
+namespace DataSharing.LuZhou.LuZhou110
+{
+    public class TaskSendTaskLuZhou110Job : IJob, IDisposable
+    {
+        private readonly IMapper _mapper;
+        private readonly ILogger<TaskOtherPlatformsJob> _logger;
+        private readonly IRepository<SendTaskLuZhou110> _sendTaskLuZhou110Repository;
+        private readonly IRepository<WaitSendTaskLuZhou110> _waitSendTaskLuZhou110Repository;
+        private readonly LZ110Invoker _lz110Invoker;
+        private readonly ISharingConfigurationManager _sharingConfigurationManager;
+        private readonly IRepository<DsSendTaskDetailInfo> _sendTaskDetailInfoRepository;
+        private readonly ILZ110RegisterManager _registerManager;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="mapper"></param>
+        /// <param name="logger"></param>
+        /// <param name="sendTaskLuZhou110Repository"></param>
+        /// <param name="waitSendTaskLuZhou110Repository"></param>
+        /// <param name="lz110Invoker"></param>
+        public TaskSendTaskLuZhou110Job(IMapper mapper,
+            ILogger<TaskOtherPlatformsJob> logger,
+            IRepository<SendTaskLuZhou110> sendTaskLuZhou110Repository,
+            IRepository<WaitSendTaskLuZhou110> waitSendTaskLuZhou110Repository,
+            LZ110Invoker lz110Invoker,
+            ISharingConfigurationManager sharingConfigurationManager,
+            IRepository<DsSendTaskDetailInfo> sendTaskDetailInfoRepository,
+            ILZ110RegisterManager registerManager)
+        {
+            _mapper = mapper;
+            _logger = logger;
+            _sendTaskLuZhou110Repository = sendTaskLuZhou110Repository;
+            _waitSendTaskLuZhou110Repository = waitSendTaskLuZhou110Repository;
+            _lz110Invoker = lz110Invoker;
+            _sharingConfigurationManager = sharingConfigurationManager;
+            _sendTaskDetailInfoRepository = sendTaskDetailInfoRepository;
+            _registerManager = registerManager;
+        }
+
+        public async Task Execute(IJobExecutionContext context)
+        {
+            var tasks = await _waitSendTaskLuZhou110Repository.Queryable()
+              .Where(d => d.State == EWaitSendTaskState.WaitPush && d.SendTimes <= 3)
+               .OrderBy(d => d.CreationTime)
+               .Take(10)
+               .ToListAsync(context.CancellationToken);
+
+            _logger.LogInformation("泸州110平台读取数据条数--------------------------------------" + tasks.Count);
+
+            if (tasks.Count != 0)
+            {
+                List<WaitSendTaskLuZhou110> list = new List<WaitSendTaskLuZhou110>();
+                //处理推送数据
+                foreach (var sendTask in tasks)
+                {
+                    //状态更改为推送中
+                    sendTask.State = EWaitSendTaskState.Pushing;
+                    //使用乐观锁，控制数据
+                    if (await _waitSendTaskLuZhou110Repository.Updateable(sendTask).ExecuteCommandWithOptLockAsync() > 0)
+                    {
+                        list.Add(sendTask);
+                    }
+                }
+                _logger.LogInformation("泸州110平台锁定条数--------------------------------------" + list.Count);
+
+                //执行推送
+                if (list != null && list.Count > 0)
+                {
+                    await SendData(list, context.CancellationToken);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 推送数据
+        /// </summary>
+        /// <param name="list"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        private async Task SendData(List<WaitSendTaskLuZhou110> list, CancellationToken cancellationToken)
+        {
+            var url = _sharingConfigurationManager.GetLuZhouConfig().LuZhou110.SendDataAddress;
+            foreach (var item in list)
+            {
+                string error = "";
+                LZ110ApiResponse<LZ110BaseResponse> response = new();
+                try
+                {
+                    response = await _lz110Invoker.RequestStringContentAsync<LZ110BaseResponse>(url + item.Path, item.Request, cancellationToken);
+                    if (!response.IsSuccess && response?.Data?.ResponseStatusObject.StatusCode == "1")// ==1：未注册，==4：已注册
+                    {
+                        await _registerManager.RefreshRegisterAsync(cancellationToken);
+                        response = await _lz110Invoker.RequestStringContentAsync<LZ110BaseResponse>(url + item.Path, item.Request, cancellationToken);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    error = ex.Message;
+                }
+
+                //写入明细表
+                DsSendTaskDetailInfo dsSendTaskInfo = new()
+                {
+                    TaskId = item.Id,
+                    Result = System.Text.RegularExpressions.Regex.Unescape(System.Text.Json.JsonSerializer.Serialize(response)),
+                    ResultErrorData = error,
+                    ProcessingServices = ""
+                };
+
+                if (response is not null)
+                {
+                    #region 处理待同步表数据
+                    //移除待同步表数据
+                    if (response.IsSuccess)
+                        await _waitSendTaskLuZhou110Repository.RemoveAsync(item, cancellationToken: cancellationToken);
+                    else
+                    {
+                        //修改待同步表数据状态
+                        item.LastTime = DateTime.Now;
+                        item.SendTimes = item.SendTimes + 1;
+
+                        if (item.FirstTime is null)
+                            item.FirstTime = DateTime.Now;
+
+                        if (item.SendTimes >= 3)
+                            item.State = EWaitSendTaskState.PushFail;
+                        else
+                            item.State = EWaitSendTaskState.WaitPush;
+
+                        await _waitSendTaskLuZhou110Repository.UpdateAsync(item, cancellationToken);
+                    }
+                    #endregion
+
+                    #region 处理推送任务表
+                    var sendTaskData = await _sendTaskLuZhou110Repository.GetAsync(p => p.Id == item.Id, cancellationToken);
+                    if (sendTaskData != null)
+                    {
+                        //处理推送时间
+                        sendTaskData.LastTime = DateTime.Now;
+                        sendTaskData.SendTimes = sendTaskData.SendTimes + 1;
+
+                        if (sendTaskData.FirstTime is null)
+                            sendTaskData.FirstTime = DateTime.Now;
+
+                        if (response.IsSuccess)
+                        {
+                            sendTaskData.IsSuccess = ESendTaskState.PushSuccess;
+                            dsSendTaskInfo.IsSuccess = true;
+                        }
+                        else
+                            sendTaskData.IsSuccess = ESendTaskState.PushFail;
+
+                        await _sendTaskLuZhou110Repository.UpdateAsync(sendTaskData, cancellationToken);
+
+                    }
+                    #endregion
+                }
+                await _sendTaskDetailInfoRepository.AddAsync(dsSendTaskInfo, cancellationToken);
+            }
+        }
+
+        public void Dispose()
+        {
+
+        }
+    }
+}

src/DataSharing/Province/SendTask/IWaitSendTaskRepository.cs

@@ -1,8 +1,6 @@
 using DataSharing.Province.SendTask.ProvinceOther;
 using DataSharing.Province.SendTask.SubmitCaseInfo;
-using DataSharing.Share.Dtos.HotlineWeb;
 using DataSharing.Share.Dtos.Statistics;
-using Hotline.Share.Dtos;
 using SqlSugar;
 using XF.Domain.Repository;
 

src/DataSharing/Province/SendTask/TaskCaseDistrecordJob.cs

@@ -1,16 +1,12 @@
-using DataSharing.Share.Dtos.FwDataExchange;
-using DataSharing.Share.Dtos.Province;
+using DataSharing.Share.Dtos.Province;
 using DataSharing.Share.Dtos.Province.XieTong;
 using DataSharing.Share.Dtos.Province.XieTong.Receive;
 using DotNetCore.CAP;
 using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
 using Hotline.Share.Dtos.File;
 using MapsterMapper;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Quartz;
-using System.Security.Cryptography;
-using System.Text.Json;
 using XF.Domain.Repository;
 
 namespace DataSharing.Province.SendTask
@@ -110,7 +106,7 @@ namespace DataSharing.Province.SendTask
                     var url = baseAddress + "market/get_case_distrecord_send";
                     #endregion
                     _logger.LogInformation("工单：{itemData.CaseSerial}，定时拉取12315请求参数--------------------------------------" + jsonData);
-                    var response = await _xieTongClient.RequestAsync<ProvinceDistrecordResponse>(url, "Post", jsonData,context.CancellationToken);
+                    var response = await _xieTongClient.RequestAsync<ProvinceDistrecordResponse>(url, "Post", jsonData, context.CancellationToken);
 
                     _logger.LogInformation($"工单：{itemData.CaseSerial}，请求的结果：-------------" + System.Text.Json.JsonSerializer.Serialize(response));
 

src/DataSharing/Province/SendTask/TaskGetOrderMatchingCallListJob.cs

@@ -10,16 +10,14 @@ namespace DataSharing.Province.SendTask
 {
     public class TaskGetOrderMatchingCallListJob : IJob, IDisposable
     {
-        private readonly IWaitSendTaskRepository _waitSendTaskRepository;
         private readonly ICapPublisher _capPublisher;
         private readonly IRepository<DsSendTaskSubmitCaseInfo> _sendTaskSubmitCaseInfoRepository;
 
-        public TaskGetOrderMatchingCallListJob(IWaitSendTaskRepository waitSendTaskRepository,
+        public TaskGetOrderMatchingCallListJob(
             ICapPublisher capPublisher,
             IRepository<DsSendTaskSubmitCaseInfo> sendTaskSubmitCaseInfoRepository
             )
         {
-            _waitSendTaskRepository = waitSendTaskRepository;
             _capPublisher = capPublisher;
             _sendTaskSubmitCaseInfoRepository = sendTaskSubmitCaseInfoRepository;
         }

src/DataSharing/Province/SendTask/TaskProvinceOtherJob.cs

@@ -463,7 +463,7 @@ namespace DataSharing.Province.SendTask
                         {
                             var name = GetName(sendTask.Path);
 
-                             _logger.LogInformation("省请求参数：" + "--------------" + sendTask.Request);
+                            _logger.LogInformation("省请求参数：" + "--------------" + sendTask.Request);
                             ProvinceResponse result = new();
                             string error = "";
                             if (sendTask.PathType == EPathType.HuiJu) //汇聚推送
@@ -503,7 +503,7 @@ namespace DataSharing.Province.SendTask
                                     error = ex.Message;
                                 }
                             }
-                             _logger.LogInformation("省接口返回：" + name + "--------------" + System.Text.RegularExpressions.Regex.Unescape(System.Text.Json.JsonSerializer.Serialize(result)));
+                            _logger.LogInformation("省接口返回：" + name + "--------------" + System.Text.RegularExpressions.Regex.Unescape(System.Text.Json.JsonSerializer.Serialize(result)));
 
                             //写入明细表
                             DsSendTaskDetailInfo dsSendTaskInfo = new()
@@ -641,7 +641,7 @@ namespace DataSharing.Province.SendTask
                 // 上传附件
                 string strResult = CFormUpload.MultipartFormDataPost(strUrl, null, dicParam, strToken);
 
-                 _logger.LogInformation("省接口上传附件返回：--------------" + strResult);
+                _logger.LogInformation("省接口上传附件返回：--------------" + strResult);
 
                 if (!string.IsNullOrEmpty(strResult))
                     return JsonConvert.DeserializeObject<ProvinceResponse>(strResult);

src/DataSharing/Province/SendTask/TaskSendCallJob.cs

@@ -4,7 +4,6 @@ using DataSharing.SendTask;
 using DataSharing.Share.Enums;
 using Microsoft.Extensions.Logging;
 using Quartz;
-using System.Threading.Tasks;
 using XF.Domain.Repository;
 
 namespace DataSharing.Province.SendTask
@@ -13,21 +12,18 @@ namespace DataSharing.Province.SendTask
     {
         private readonly ILogger<TaskSendCallJob> _logger;
         private readonly IRepository<DsSendTaskSubmitCaseRecord> _sendTaskSubmitCaseRecordRepository;
-        private readonly IRepository<DsWaitSendTaskSubmitCaseRecord> _waitSendTaskSubmitCaseRecordRepository;
         private readonly IRepository<DsSendCall> _dsSendCallRepository;
         private readonly IInitPushDataService _initPushDataService;
         private readonly IChannelConfigurationManager _channelConfigurationManager;
 
         public TaskSendCallJob(ILogger<TaskSendCallJob> logger,
                 IRepository<DsSendTaskSubmitCaseRecord> sendTaskSubmitCaseRecordRepository,
-            IRepository<DsWaitSendTaskSubmitCaseRecord> waitSendTaskSubmitCaseRecordRepository,
             IRepository<DsSendCall> dsSendCallRepository,
              IInitPushDataService initPushDataService,
              IChannelConfigurationManager channelConfigurationManager)
         {
             _logger = logger;
             _sendTaskSubmitCaseRecordRepository = sendTaskSubmitCaseRecordRepository;
-            _waitSendTaskSubmitCaseRecordRepository = waitSendTaskSubmitCaseRecordRepository;
             _dsSendCallRepository = dsSendCallRepository;
             _initPushDataService = initPushDataService;
             _channelConfigurationManager = channelConfigurationManager;

src/DataSharing/Province/SendTask/TaskSendRealTimeStatusJob.cs

@@ -4,7 +4,6 @@ using DataSharing.Share.Consts;
 using DataSharing.Share.Dtos.HotlineWeb;
 using DataSharing.Share.Dtos.Province.XieTong.Send;
 using DataSharing.Share.Enums;
-using DotNetCore.CAP;
 using MapsterMapper;
 using Microsoft.Extensions.Logging;
 using Quartz;
@@ -19,7 +18,6 @@ namespace DataSharing.Province.SendTask
     {
         private readonly ILogger<TaskSendRealTimeStatusJob> _logger;
         private readonly IChannelConfigurationManager _channelConfigurationManager;
-        private readonly ICapPublisher _capPublisher;
         private readonly IMapper _mapper;
         private readonly ITypedCache<ConfigurationInformationDto> _configurationInformationCache;
         private readonly IRepository<DsOrder> _dsOrderRepository;
@@ -33,7 +31,6 @@ namespace DataSharing.Province.SendTask
         /// <param name="logger"></param>
         /// <param name="channelConfigurationManager"></param>
         /// <param name="mapper"></param>
-        /// <param name="capPublisher"></param>
         /// <param name="configurationInformationCache"></param>
         /// <param name="dsOrderRepository"></param>
         /// <param name="dsTelCallRepository"></param>
@@ -42,7 +39,6 @@ namespace DataSharing.Province.SendTask
         public TaskSendRealTimeStatusJob(ILogger<TaskSendRealTimeStatusJob> logger,
             IChannelConfigurationManager channelConfigurationManager,
             IMapper mapper,
-            ICapPublisher capPublisher,
             ITypedCache<ConfigurationInformationDto> configurationInformationCache,
             IRepository<DsOrder> dsOrderRepository,
             IRepository<DsTelCall> dsTelCallRepository,
@@ -52,7 +48,6 @@ namespace DataSharing.Province.SendTask
             _logger = logger;
             _channelConfigurationManager = channelConfigurationManager;
             _mapper = mapper;
-            _capPublisher = capPublisher;
             _configurationInformationCache = configurationInformationCache;
             _dsOrderRepository = dsOrderRepository;
             _dsTelCallRepository = dsTelCallRepository;
@@ -67,7 +62,7 @@ namespace DataSharing.Province.SendTask
         /// <returns></returns>
         public async Task Execute(IJobExecutionContext context)
         {
-          _logger.LogInformation($"进来了时间是{DateTime.Now}");
+            _logger.LogInformation($"进来了时间是{DateTime.Now}");
             //实时服务信息
             SendRealTimeStatusInfo dto = new()
             {

src/DataSharing/Province/SendTask/TaskSubmitCaseInfoJob.cs

@@ -425,7 +425,7 @@ namespace DataSharing.Province.SendTask
            .Take(50)
            .ToListAsync(context.CancellationToken);
 
-             _logger.LogInformation("业务汇聚-服务工单受理读取数据条数--------------------------------------" + tasks.Count);
+            _logger.LogInformation("业务汇聚-服务工单受理读取数据条数--------------------------------------" + tasks.Count);
 
             if (tasks.Count != 0)
             {
@@ -478,26 +478,26 @@ namespace DataSharing.Province.SendTask
                     }
                 }
 
-                 _logger.LogInformation("业务汇聚-服务工单受理锁定条数--------------------------------------" + taskData.Count);
+                _logger.LogInformation("业务汇聚-服务工单受理锁定条数--------------------------------------" + taskData.Count);
 
                 if (listOrder != null && listOrder.Count > 0)
                 {
                     request.SetData(listOrder);
                     var jsonData = request.ToString();
-                     _logger.LogInformation("业务汇聚-服务工单受理请求参数--------------------------------------" + jsonData);
+                    _logger.LogInformation("业务汇聚-服务工单受理请求参数--------------------------------------" + jsonData);
                     ProvinceResponse result = new();
                     string error = "";
                     //执行推送任务
                     try
                     {
-                         _logger.LogInformation("准备推送--------------------------------------");
+                        _logger.LogInformation("准备推送--------------------------------------");
                         result = await _huiJuClient.RequestAsync<ProvinceResponse>(configProvince.HuiJu + PtahDefaults.SubmitCaseInfo, "Post", jsonData, context.CancellationToken);
                     }
                     catch (Exception ex)
                     {
                         error = ex.Message;
                     }
-                     _logger.LogInformation("业务汇聚-服务工单受理返回参数--------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
+                    _logger.LogInformation("业务汇聚-服务工单受理返回参数--------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
                     if (result != null)
                     {
                         //处理数据

src/DataSharing/Province/SendTask/TaskSubmitCaseProcessJob.cs

@@ -418,7 +418,7 @@ namespace DataSharing.Province.SendTask
            .OrderBy(d => d.CreationTime)
            .Take(50)
            .ToListAsync(context.CancellationToken);
-             _logger.LogInformation("业务汇聚-服务工单处理过程读取数据条数--------------------------------------" + tasks.Count);
+            _logger.LogInformation("业务汇聚-服务工单处理过程读取数据条数--------------------------------------" + tasks.Count);
             if (tasks.Count != 0)
             {
                 #region 处理请求参数
@@ -465,12 +465,12 @@ namespace DataSharing.Province.SendTask
 
                     }
                 }
-                 _logger.LogInformation("业务汇聚-服务工单处理过程锁定条数--------------------------------------" + taskData.Count);
+                _logger.LogInformation("业务汇聚-服务工单处理过程锁定条数--------------------------------------" + taskData.Count);
                 if (listOrder != null && listOrder.Count > 0)
                 {
                     request.SetData(listOrder);
                     var jsonData = request.ToString();
-                     _logger.LogInformation("业务汇聚-服务工单处理过程请求参数--------------------------------------" + jsonData);
+                    _logger.LogInformation("业务汇聚-服务工单处理过程请求参数--------------------------------------" + jsonData);
                     ProvinceResponse result = new();
                     string error = "";
                     //执行推送任务
@@ -482,7 +482,7 @@ namespace DataSharing.Province.SendTask
                     {
                         error = ex.Message;
                     }
-                     _logger.LogInformation("业务汇聚-服务工单处理过程返回数据-------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
+                    _logger.LogInformation("业务汇聚-服务工单处理过程返回数据-------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
                     if (result != null)
                     {
                         //处理数据

src/DataSharing/Province/SendTask/TaskSubmitCaseRecordJob.cs

@@ -68,7 +68,7 @@ namespace DataSharing.Province.SendTask
            .OrderBy(d => d.CreationTime)
            .Take(50)
            .ToListAsync(context.CancellationToken);
-             _logger.LogInformation("业务汇聚-电话记录读取数据条数--------------------------------------" + tasks.Count);
+            _logger.LogInformation("业务汇聚-电话记录读取数据条数--------------------------------------" + tasks.Count);
             if (tasks.Count != 0)
             {
                 #region 处理请求参数
@@ -99,13 +99,13 @@ namespace DataSharing.Province.SendTask
                     }
                 }
 
-                 _logger.LogInformation("业务汇聚-电话记录锁定条数--------------------------------------" + taskData.Count);
+                _logger.LogInformation("业务汇聚-电话记录锁定条数--------------------------------------" + taskData.Count);
 
                 if (listOrder != null && listOrder.Count > 0)
                 {
                     request.SetData(listOrder);
                     var jsonData = request.ToString();
-                     _logger.LogInformation("业务汇聚-电话记录请求参数--------------------------------------" + jsonData);
+                    _logger.LogInformation("业务汇聚-电话记录请求参数--------------------------------------" + jsonData);
                     ProvinceResponse result = new();
                     string error = "";
                     //执行推送任务
@@ -117,7 +117,7 @@ namespace DataSharing.Province.SendTask
                     {
                         error = ex.Message;
                     }
-                     _logger.LogInformation("业务汇聚-电话记录返回参数--------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
+                    _logger.LogInformation("业务汇聚-电话记录返回参数--------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
                     if (result != null)
                     {
                         //处理数据

src/DataSharing/Province/SendTask/TaskSubmitCaseResultJob.cs

@@ -418,7 +418,7 @@ namespace DataSharing.Province.SendTask
            .OrderBy(d => d.CreationTime)
            .Take(50)
            .ToListAsync(context.CancellationToken);
-             _logger.LogInformation("业务汇聚-服务工单处理结果读取数据条数--------------------------------------" + tasks.Count);
+            _logger.LogInformation("业务汇聚-服务工单处理结果读取数据条数--------------------------------------" + tasks.Count);
             if (tasks.Count != 0)
             {
                 #region 处理请求参数
@@ -464,12 +464,12 @@ namespace DataSharing.Province.SendTask
                         }
                     }
                 }
-                 _logger.LogInformation("业务汇聚-服务工单处理结果锁定条数--------------------------------------" + taskData.Count);
+                _logger.LogInformation("业务汇聚-服务工单处理结果锁定条数--------------------------------------" + taskData.Count);
                 if (listOrder != null && listOrder.Count > 0)
                 {
                     request.SetData(listOrder);
                     var jsonData = request.ToString();
-                     _logger.LogInformation("业务汇聚-服务工单处理结果请求参数--------------------------------------" + jsonData);
+                    _logger.LogInformation("业务汇聚-服务工单处理结果请求参数--------------------------------------" + jsonData);
                     ProvinceResponse result = new();
                     string error = "";
                     //执行推送任务
@@ -481,7 +481,7 @@ namespace DataSharing.Province.SendTask
                     {
                         error = ex.Message;
                     }
-                     _logger.LogInformation("业务汇聚-服务工单处理结果返回参数--------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
+                    _logger.LogInformation("业务汇聚-服务工单处理结果返回参数--------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
                     if (result != null)
                     {
                         //处理数据

src/DataSharing/Province/SendTask/TaskSubmitCaseTotalJob.cs

@@ -49,7 +49,7 @@ namespace DataSharing.Province.SendTask
 
         public async Task Execute(IJobExecutionContext context)
         {
-          _logger.LogInformation($"数据汇聚，进来了时间是{DateTime.Now}");
+            _logger.LogInformation($"数据汇聚，进来了时间是{DateTime.Now}");
 
             var data = await _fwClient.RequestNoTokenAsync<SubmitCaseTotalnfoResponse>("api/v1/Order/get-orderurge-count", "Get", null);
             SubmitCaseTotalInfo submitCaseTotal = new()

src/DataSharing/Province/SendTask/TaskSubmitVisitInfoJob.cs

@@ -419,7 +419,7 @@ namespace DataSharing.Province.SendTask
            .Take(50)
            .ToListAsync(context.CancellationToken);
 
-             _logger.LogInformation("业务汇聚-服务工单评价读取数据条数--------------------------------------" + tasks.Count);
+            _logger.LogInformation("业务汇聚-服务工单评价读取数据条数--------------------------------------" + tasks.Count);
 
             if (tasks.Count != 0)
             {
@@ -470,13 +470,13 @@ namespace DataSharing.Province.SendTask
                         }
                     }
                 }
-                 _logger.LogInformation("业务汇聚-服务工单评价锁定条数--------------------------------------" + taskData.Count);
+                _logger.LogInformation("业务汇聚-服务工单评价锁定条数--------------------------------------" + taskData.Count);
 
                 if (listOrder != null && listOrder.Count > 0)
                 {
                     request.SetData(listOrder);
                     var jsonData = request.ToString();
-                     _logger.LogInformation("业务汇聚服务工单评价请求参数--------------------------------------" + jsonData);
+                    _logger.LogInformation("业务汇聚服务工单评价请求参数--------------------------------------" + jsonData);
                     ProvinceResponse result = new();
                     string error = "";
                     //执行推送任务
@@ -488,7 +488,7 @@ namespace DataSharing.Province.SendTask
                     {
                         error = ex.Message;
                     }
-                     _logger.LogInformation("业务汇聚-服务工单评价返回参数--------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
+                    _logger.LogInformation("业务汇聚-服务工单评价返回参数--------------------------------------" + System.Text.RegularExpressions.Regex.Unescape(JsonSerializer.Serialize(result)));
                     if (result != null)
                     {
                         //处理数据