tangjiang 11 ヶ月 前
コミット
e54e525981

+ 1 - 3
src/DataSharing.Host/Controllers/ProvinceController.cs

@@ -948,8 +948,6 @@ namespace DataSharing.Host.Controllers
                                 Files = listFiles,
                                 Source= ESource.ProvinceStraight
                             };
-                            // await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, addOrder, cancellationToken: HttpContext.RequestAborted);
-                            //  var result = await _hotlineClient.ReceiveOrderAsync(addOrder, HttpContext.RequestAborted);
                             await _fwClient.RequestNoTokenAsync<HotlineClientResponse>("api/v1/Order/add-anonymous", "Post", System.Text.Json.JsonSerializer.Serialize(addOrder));
                             break;
                         case "get_case_back_result":
@@ -977,7 +975,7 @@ namespace DataSharing.Host.Controllers
                             listFiles = await InitFileData(listData, "工单催单");
 
                             //向业务系统推送消息
-                            await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderRemind, new ProvinceOrderUrgeDto() { CaseSerial = tmpCaseMaterialInfo.CaseSerial }, cancellationToken: HttpContext.RequestAborted);
+                            await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderRemind, new ProvinceOrderUrgeDto() { CaseSerial = tmpCaseMaterialInfo.CaseSerial, Files=listFiles }, cancellationToken: HttpContext.RequestAborted);
 
                             break;
                         case "screen_case_result_receive":

+ 21 - 21
src/DataSharing.Host/StartupHelper.cs

@@ -1,5 +1,4 @@
-using System.Text;
-using DataSharing.Repository;
+using DataSharing.Repository;
 using DataSharing.SendTask;
 using Mapster;
 using MapsterMapper;
@@ -8,6 +7,7 @@ using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
 using Quartz;
 using Quartz.AspNetCore;
+using System.Text;
 using XF.Domain.Entities;
 using XF.Domain.Exceptions;
 using XF.Domain.Options;
@@ -201,25 +201,25 @@ namespace DataSharing.Host
                     .WithCronSchedule("0/1 * * * * ? ")
                 );
 
-                //2小时定时拉取12315的办理过程
-                var taskCaseDistrecordJobKey = new JobKey("task-case-distrecord-job", "task case distrecord job");
-                d.AddJob<TaskCaseDistrecordJob>(taskCaseDistrecordJobKey);
-                d.AddTrigger(t => t
-                    .WithIdentity("task-case-distrecord-job-trigger")
-                    .ForJob(taskCaseDistrecordJobKey)
-                    .StartNow()
-                    .WithCronSchedule("0 0 */2 * * ?")//
-                );
-
-                //每天凌晨1点推送业务汇聚-统计数据
-                var taskSubmitCaseTotalJobKey = new JobKey("task-submit-case-total-job", "task submit case total job");
-                d.AddJob<TaskSubmitCaseTotalJob>(taskSubmitCaseTotalJobKey);
-                d.AddTrigger(t => t
-                    .WithIdentity("task-submit-case-total-job-trigger")
-                    .ForJob(taskSubmitCaseTotalJobKey)
-                   .StartNow()
-                    .WithCronSchedule("0 0 1 * * ?")//0 0 1 * * ?
-                );
+                ////2小时定时拉取12315的办理过程
+                //var taskCaseDistrecordJobKey = new JobKey("task-case-distrecord-job", "task case distrecord job");
+                //d.AddJob<TaskCaseDistrecordJob>(taskCaseDistrecordJobKey);
+                //d.AddTrigger(t => t
+                //    .WithIdentity("task-case-distrecord-job-trigger")
+                //    .ForJob(taskCaseDistrecordJobKey)
+                //    .StartNow()
+                //    .WithCronSchedule("0 0 */2 * * ?")//
+                //);
+
+                ////每天凌晨1点推送业务汇聚-统计数据
+                //var taskSubmitCaseTotalJobKey = new JobKey("task-submit-case-total-job", "task submit case total job");
+                //d.AddJob<TaskSubmitCaseTotalJob>(taskSubmitCaseTotalJobKey);
+                //d.AddTrigger(t => t
+                //    .WithIdentity("task-submit-case-total-job-trigger")
+                //    .ForJob(taskSubmitCaseTotalJobKey)
+                //   .StartNow()
+                //    .WithCronSchedule("0 0 1 * * ?")//0 0 1 * * ?
+                //);
 
             });
             ///

+ 61 - 0
src/DataSharing/Province/PusherProviderService.cs

@@ -72,6 +72,67 @@ namespace DataSharing.Province
             if (dto is null)
                 return;
 
+            List<string> list = new()
+            {
+            "RGDH9951150024050100003",
+            "RGDH9951150024050100002",
+            "RGDH9951150024050400002",
+            "RGDH9951150024050400004",
+            "RGDH9951150024050400005",
+            "RGDH9951150024050400009",
+            "RGDH9951150024050400010",
+            "RGDH9951150024050400011",
+            "RGDH9951150024050400008",
+            "RGDH9951150024050500001",
+            "RGDH9951150024050500005",
+            "RGDH9951150024050500009",
+            "RGDH9951150024050500004",
+            "RGDH9951150024050600001",
+            "RGDH9951150024050600002",
+            "RGDH9951150024050600006",
+            "RGDH9951150024050600005",
+            "RGDH9951150024050600008",
+            "RGDH9951150024050600004",
+            "RGDH9951150024050600010",
+            "RGDH9951150024050600011",
+            "RGDH9951150024050700001",
+            "RGDH9951150024050800001",
+            "RGDH9951150024050800005",
+            "RGDH9951150024050800009",
+            "RGDH9951150024050800008",
+            "RGDH9951150024050800012",
+            "RGDH9951150024050800013",
+            "RGDH9951150024050800007",
+            "RGDH9951150024050900002",
+            "RGDH9951150024050900001",
+            "RGDH9951150024050900006",
+            "RGDH9951150024050900009",
+            "RGDH9951150024050900007",
+            "RGDH9951150024051000001",
+            "RGDH9951150024051100001",
+            "RGDH9951150024050100001",
+            "RGDH9951150024051100004",
+            "RGDH9951150024051100006",
+            "RGDH9951150024051200002",
+            "RGDH9951150024051200004",
+            "RGDH9951150024051300002",
+            "RGDH9951150024051300001",
+            "RGDH9951150024051400001",
+            "RGDH9951150024051500001",
+            "RGDH9951150024051500002",
+            "RGDH9951150024051500006",
+            "RGDH9951150024051500003"
+        };
+            for (int i = 0; i < list.Count; i++)
+            {
+                if (dto.Request.Contains(list[i]))
+                {
+                    dto.IsSuccess = true;
+                    await _dsSendTaskRepository.UpdateAsync(dto, cancellationToken);
+                    return;
+                }
+            }
+
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
             if (configProvince.SendTaskStartTime != null && configProvince.SendTaskStartTime > dto.GenerationTime)
             {