tangjiang il y a 8 mois
Parent
commit
e526ca1841

+ 41 - 0
src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -20,6 +20,7 @@ using DataSharing.Share.Enums;
 using DataSharing.Share.Requests;
 using DotNetCore.CAP;
 using Hotline.Share.Dtos;
+using Hotline.Share.Dtos.Order;
 using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
@@ -1583,5 +1584,45 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                  .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
             return new PagedDto<DsGetCaseMaterialInfo>(total, items);
         }
+
+        /// <summary>
+        /// 修改工单来源推送省平台
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("updateordersource")]
+        [AllowAnonymous]
+        public async Task UpdateOrderSourceAsync()
+        {
+            //查询数据
+            var items = await _dsOrderSendRepository.Queryable()
+                .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
+                .Where((p, o) => p.FirstSendProvinceTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"))
+                && p.FirstSendProvinceTime <= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")) && p.CaseSourceCode == "RGDH")
+                .Where((p, o) => p.FirstSendProvinceTime.HasValue && p.HandleState == "办理完成")
+                .Where((p, o) => o.CallId == null || o.CallId == "")
+                .OrderByDescending((p, o) => p.CreationTime)
+                .ToListAsync();
+
+            //处理数据
+            if (items != null && items.Any())
+            {
+                // _logger.LogWarning("读取到条数:" + "--------------" + items.Count);
+                List<string> Ids = [];
+                foreach (var item in items)
+                {
+                    Ids.Add(item.OrderId);
+                }
+                //推送数据
+                if (Ids != null && Ids.Count > 0)
+                {
+                    UpdateOrderSourceChannelDto data = new()
+                    {
+                        Ids = Ids,
+                        IsPush = true
+                    };
+                    await _fwClient.RequestNoTokenAsync<HotlineClientResponse>("api/v1/Order/update-order-sourcechannel", "Post", System.Text.Json.JsonSerializer.Serialize(data));
+                }
+            }
+        }
     }
 }

+ 0 - 9
src/DataSharing.Host/StartupHelper.cs

@@ -304,15 +304,6 @@ namespace DataSharing.Host
                 //    .WithCronSchedule("0 0 1 * * ?")//0 0 1 * * ?
                 //);
 
-                ////每天晚上23点执行修改来源方式任务
-                //var taskUpdateOrderSourceJobKey = new JobKey("task-update-order-source-job", "task update order source job");
-                //d.AddJob<TaskUpdateOrderSourceJob>(taskUpdateOrderSourceJobKey);
-                //d.AddTrigger(t => t
-                //    .WithIdentity("task-update-order-source-job-trigger")
-                //    .ForJob(taskUpdateOrderSourceJobKey)
-                //   .StartNow()
-                //    .WithCronSchedule("0 0 23 * * ? ")
-                //);
             });
 
 

+ 0 - 5
src/DataSharing/ChannelConfiguration.cs

@@ -7,11 +7,6 @@
         /// </summary>
         public string ProcessingServices { get; set; }
 
-        /// <summary>
-        /// 是否开启推送
-        /// </summary>
-        public bool IsOpenPush { get; set; }
-
         /// <summary>
         /// 业务系统附件上传配置
         /// </summary>

+ 0 - 9
src/DataSharing/ChannelConfigurationManager.cs

@@ -28,15 +28,6 @@ namespace DataSharing
             return _channelOption.Value.ProcessingServices;
         }
 
-        /// <summary>
-        /// 是否开启推送
-        /// </summary>
-        /// <returns></returns>
-        public bool GetConfigurationIsOpenPush()
-        {
-            return _channelOption.Value.IsOpenPush;
-        }
-
         /// <summary>
         /// 业务系统附件上传配置
         /// </summary>

+ 0 - 6
src/DataSharing/IChannelConfigurationManager.cs

@@ -8,12 +8,6 @@
         /// <returns></returns>
         string GetConfigurationProcessingServices();
 
-        /// <summary>
-        /// 是否开启推送
-        /// </summary>
-        /// <returns></returns>
-        bool GetConfigurationIsOpenPush();
-
         /// <summary>
         /// 业务系统附件上传配置
         /// </summary>

+ 0 - 80
src/DataSharing/Province/SendTask/TaskUpdateOrderSourceJob.cs

@@ -1,80 +0,0 @@
-using DataSharing.FwDataExchange;
-using DataSharing.RawData;
-using DataSharing.SendTask;
-using DataSharing.Share.Dtos.HotlineSetting;
-using Hotline.Share.Dtos.Order;
-using MapsterMapper;
-using Microsoft.Extensions.Logging;
-using Quartz;
-using SqlSugar;
-using XF.Domain.Repository;
-
-namespace DataSharing.Province.SendTask
-{
-    public class TaskUpdateOrderSourceJob : IJob, IDisposable
-    {
-        private readonly IMapper _mapper;
-        private readonly ILogger<TaskUpdateOrderSourceJob> _logger;
-        private readonly IRepository<DsOrderSend> _dsOrderSendRepository;
-        private readonly FwClient _fwClient;
-        private readonly IChannelConfigurationManager _channelConfigurationManager;
-
-        public TaskUpdateOrderSourceJob(IMapper mapper,
-            ILogger<TaskUpdateOrderSourceJob> logger,
-            IRepository<DsOrderSend> dsOrderSendRepository,
-            FwClient fwClient,
-            IChannelConfigurationManager channelConfigurationManager)
-        {
-            _mapper = mapper;
-            _logger = logger;
-            _dsOrderSendRepository = dsOrderSendRepository;
-            _fwClient = fwClient;
-            _channelConfigurationManager = channelConfigurationManager;
-        }
-
-        public async Task Execute(IJobExecutionContext context)
-        {
-            var isOpenPush = _channelConfigurationManager.GetConfigurationIsOpenPush();
-            _logger.LogWarning("是否开启:" + "--------------" + isOpenPush);
-            if (isOpenPush == true)
-            {
-                //查询数据
-                var items = await _dsOrderSendRepository.Queryable()
-                    .LeftJoin<DsTelCall>((p, o) => p.CallId == o.CallId)
-                    .Where((p, o) => p.FirstSendProvinceTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"))
-                    && p.FirstSendProvinceTime <= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")) && p.CaseSourceCode == "RGDH")
-                    .Where((p, o) => p.FirstSendProvinceTime.HasValue && p.HandleState == "办理完成")
-                    .Where((p, o) => o.CallId == null || o.CallId == "")
-                    .OrderByDescending((p, o) => p.CreationTime)
-                    .ToListAsync();
-
-                //处理数据
-                if (items != null && items.Any())
-                {
-                    _logger.LogWarning("读取到条数:" + "--------------" + items.Count);
-                    List<string> Ids = [];
-                    foreach (var item in items)
-                    {
-                        Ids.Add(item.OrderId);
-                    }
-                    //推送数据
-                    if (Ids != null && Ids.Count > 0)
-                    {
-                        UpdateOrderSourceChannelDto data = new()
-                        {
-                            Ids = Ids,
-                            IsPush = true
-                        };
-                        await _fwClient.RequestNoTokenAsync<HotlineClientResponse>("api/v1/Order/update-order-sourcechannel", "Post", System.Text.Json.JsonSerializer.Serialize(data));
-                    }
-                }
-            }
-        }
-
-
-        public void Dispose()
-        {
-
-        }
-    }
-}