|
@@ -163,7 +163,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("GetCaseBackApply", "get_case_back_apply", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("GetCaseBackApply", "get_case_back_apply", jsonData, data.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.SendBack.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken: cancellationToken);
|
|
@@ -205,7 +205,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SendSuperviseProcessInfo", "send_supervise_process_info", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SendSuperviseProcessInfo", "send_supervise_process_info", jsonData, dto.Order.ProvinceNo, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -241,7 +241,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SendSuperviseResultInfo", "send_supervise_result_info", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SendSuperviseResultInfo", "send_supervise_result_info", jsonData, dto.Order.ProvinceNo, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.Supervise.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Supervise, dto.Order.AreaCode, cancellationToken);
|
|
|
|
|
@@ -285,7 +285,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("ScreenCaseInfoSend", "screen_case_info_send", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("ScreenCaseInfoSend", "screen_case_info_send", jsonData, data.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.Screen.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken: cancellationToken);
|
|
|
}
|
|
@@ -320,7 +320,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("DelayCaseInfoSend", "delay_case_info_send", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("DelayCaseInfoSend", "delay_case_info_send", jsonData, data.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Process, data.AreaCode, cancellationToken);
|
|
@@ -361,7 +361,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitCaseInfo", "submit_case_info", jsonData, pathType: EPathType.HuiJu, taskPriority: 10, GenerationTime: pushdto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitCaseInfo", "submit_case_info", jsonData, data.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 10, GenerationTime: pushdto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.FileJson, dto.ProvinceNo, data.CliengGuid, EMaterialType.Acceptance, data.AreaCode, cancellationToken);
|
|
|
}
|
|
@@ -462,7 +462,7 @@ namespace DataSharing.Application.Receivers
|
|
|
jsonDataCall = jsonDataCall.Replace("0001-01-01 00:00:00", "");
|
|
|
var urlCall = configProvince.HuiJu + "submit_case_record";
|
|
|
//将待推送数据写入待推送表
|
|
|
- var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonDataCall, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: pushdto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonDataCall, dataCall.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: pushdto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//本地保存通话记录数据
|
|
|
await InitTelCallData(pushdto.TrCallRecordDto, dto.ProvinceNo, taskId, cancellationToken);
|
|
@@ -498,7 +498,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitCaseInfo", "submit_case_info", jsonData, pathType: EPathType.HuiJu, taskPriority: 10, GenerationTime: dto.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitCaseInfo", "submit_case_info", jsonData, data.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 10, GenerationTime: dto.StartTime, cancellationToken: cancellationToken);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -538,7 +538,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitCaseInfo", "submit_case_info", jsonDataSubmitCaseInfo, pathType: EPathType.HuiJu, taskPriority: 10, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitCaseInfo", "submit_case_info", jsonDataSubmitCaseInfo, submitCaseInfo.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 10, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
//如果话务部派出去,再次上传附件
|
|
|
if (dto.Order.ActualHandleStepName == "话务部")
|
|
|
{
|
|
@@ -620,7 +620,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitCaseInfo", "submit_case_info", jsonData, pathType: EPathType.HuiJu, taskPriority: 10, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitCaseInfo", "submit_case_info", jsonData, data.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 10, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//推送服务工单结果信息-组装110数据
|
|
|
await SubmitCaseResultAsync(dto, cancellationToken);
|
|
@@ -705,7 +705,7 @@ namespace DataSharing.Application.Receivers
|
|
|
jsonDataCall = jsonDataCall.Replace("0001-01-01 00:00:00", "");
|
|
|
var urlCall = configProvince.HuiJu + "submit_case_record";
|
|
|
//将待推送数据写入待推送表
|
|
|
- var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonDataCall, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonDataCall, dataCall.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//本地保存通话记录数据
|
|
|
await InitTelCallData(dto.TrCallRecordDto, dto.Order.ProvinceNo, taskId, cancellationToken);
|
|
@@ -792,7 +792,7 @@ namespace DataSharing.Application.Receivers
|
|
|
|
|
|
var startTime = dto.Order == null ? dto.TrCallRecordDto.BeginIvrTime : dto.Order.StartTime;
|
|
|
//将待推送数据写入待推送表
|
|
|
- var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonData, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: startTime, cancellationToken: cancellationToken);
|
|
|
+ var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonData, data.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: startTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//本地保存通话记录数据
|
|
|
await InitTelCallData(dto.TrCallRecordDto, data.CaseSerial, taskId, cancellationToken);
|
|
@@ -854,7 +854,7 @@ namespace DataSharing.Application.Receivers
|
|
|
|
|
|
var startTime = dto.Order == null ? dto.TrCallRecordDto.BeginIvrTime : dto.Order.StartTime;
|
|
|
//将待推送数据写入待推送表
|
|
|
- var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonData, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: startTime, cancellationToken: cancellationToken);
|
|
|
+ var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonData, data.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: startTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//本地保存通话记录数据
|
|
|
await InitTelCallData(dto.TrCallRecordDto, data.CaseSerial, taskId, cancellationToken);
|
|
@@ -876,7 +876,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitCaseTotal", "submit_case_total", jsonData, pathType: EPathType.HuiJu, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitCaseTotal", "submit_case_total", jsonData, "", pathType: EPathType.HuiJu, cancellationToken: cancellationToken);
|
|
|
}
|
|
|
|
|
|
#endregion
|
|
@@ -902,7 +902,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SupplyCaseInfoSend", "supply_case_info_send", jsonData, pathType: EPathType.XieTong, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SupplyCaseInfoSend", "supply_case_info_send", jsonData, dto.CaseSerial, pathType: EPathType.XieTong, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(null, dto.CaseSerial, dto.CliengGuid, EMaterialType.Process, dto.AreaCode, cancellationToken);
|
|
@@ -931,7 +931,7 @@ namespace DataSharing.Application.Receivers
|
|
|
|
|
|
var configEnterprise = _channelConfigurationManager.GetConfigurationEnterprise();
|
|
|
//将待推送数据写入待推送表configEnterprise.AddressUrl +
|
|
|
- await InitPushDataAsync("EnterpriseCancelWorkOrder", YbEnterpriseDefaults.PathEnterprisesCancelWorkOrder, System.Text.Json.JsonSerializer.Serialize(dsDataWork), platformSource: EPlatformSource.Enterprise, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("EnterpriseCancelWorkOrder", YbEnterpriseDefaults.PathEnterprisesCancelWorkOrder, System.Text.Json.JsonSerializer.Serialize(dsDataWork), dto.Order.ProvinceNo, platformSource: EPlatformSource.Enterprise, cancellationToken: cancellationToken);
|
|
|
}
|
|
|
|
|
|
//省12345
|
|
@@ -970,7 +970,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SendRevokeCaseInfo", "revoke_case_info", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SendRevokeCaseInfo", "revoke_case_info", jsonData, dsRevoke.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
await FileDataAsync(dto.Special.FileJson, dto.Order.ProvinceNo, dsRevoke.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
|
|
|
}
|
|
@@ -1007,7 +1007,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SendRemindCaseInfo", "remind_case_info", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SendRemindCaseInfo", "remind_case_info", jsonData, data.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.Urge.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
|
|
@@ -1105,7 +1105,7 @@ namespace DataSharing.Application.Receivers
|
|
|
var url = configProvince.XieTong + "get_case_result_receive";
|
|
|
#endregion
|
|
|
|
|
|
- await InitPushDataAsync("GetCaseResultReceive", "get_case_result_receive", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("GetCaseResultReceive", "get_case_result_receive", jsonData, data.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(null, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Result, dto.Order.AreaCode, cancellationToken);
|
|
@@ -1126,7 +1126,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("ZmhdCaseInfoPublic", "zmhd_case_info_public", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("ZmhdCaseInfoPublic", "zmhd_case_info_public", jsonData, data.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1270,7 +1270,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("GetKnowledgeInfoSend", "get_knowledge_info_send", jsonData, pathType: EPathType.HuiJu, GenerationTime: dto.CreatDate, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("GetKnowledgeInfoSend", "get_knowledge_info_send", jsonData, data.UID, pathType: EPathType.HuiJu, GenerationTime: dto.CreatDate, cancellationToken: cancellationToken);
|
|
|
|
|
|
#region 处理知识库原始数据
|
|
|
//查询原有数据,如果有修改原始数据,没有直接新增
|
|
@@ -1320,7 +1320,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("GetKnowledgeInfoUpdate", "get_knowledge_info_update", jsonData, pathType: EPathType.HuiJu, GenerationTime: dto.CreatDate, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("GetKnowledgeInfoUpdate", "get_knowledge_info_update", jsonData, data.UID, pathType: EPathType.HuiJu, GenerationTime: dto.CreatDate, cancellationToken: cancellationToken);
|
|
|
|
|
|
#region 处理知识库原始数据
|
|
|
//查询原有数据,如果有修改原始数据,没有直接新增
|
|
@@ -1365,7 +1365,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("GetKnowledgeInfoAbandon", "get_knowledge_info_abandon", jsonData, pathType: EPathType.HuiJu, GenerationTime: dto.CreatDate, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("GetKnowledgeInfoAbandon", "get_knowledge_info_abandon", jsonData, data.UID, pathType: EPathType.HuiJu, GenerationTime: dto.CreatDate, cancellationToken: cancellationToken);
|
|
|
|
|
|
//知识下架删除原有原始数据
|
|
|
await _knowledgeRawDataRepository.RemoveAsync(p => p.UID == data.UID, cancellationToken: cancellationToken);
|
|
@@ -1390,7 +1390,7 @@ namespace DataSharing.Application.Receivers
|
|
|
var url = configProvince.HuiJu + "sendrealtimestatus";
|
|
|
#endregion
|
|
|
|
|
|
- await InitPushDataAsync("SendRealTimeStatus", "sendrealtimestatus", jsonData, pathType: EPathType.HuiJu, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SendRealTimeStatus", "sendrealtimestatus", jsonData, "", pathType: EPathType.HuiJu, cancellationToken: cancellationToken);
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
@@ -1441,7 +1441,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("GetCaseProcessReceive", "get_case_process_receive", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("GetCaseProcessReceive", "get_case_process_receive", jsonData, data.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.WorkflowTrace.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
|
|
@@ -1465,7 +1465,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitCaseProcess", "submit_case_process", jsonDataSubmitCaseProcessInfo, pathType: EPathType.HuiJu, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitCaseProcess", "submit_case_process", jsonDataSubmitCaseProcessInfo, data.CaseSerial, pathType: EPathType.HuiJu, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.WorkflowTrace.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
|
|
@@ -1580,7 +1580,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("GetVisitInfoReceive", "get_visit_info_receive", jsonData, pathType: EPathType.XieTong, taskPriority: 5, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("GetVisitInfoReceive", "get_visit_info_receive", jsonData, data.CaseSerial, pathType: EPathType.XieTong, taskPriority: 5, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
//处理附件
|
|
|
await FileDataAsync(null, data.CaseSerial, data.CliengGuid, EMaterialType.Visit, data.AreaCode, cancellationToken);
|
|
|
}
|
|
@@ -1602,7 +1602,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitVisitInfo", "submit_visit_info", jsonData, pathType: EPathType.HuiJu, taskPriority: 5, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitVisitInfo", "submit_visit_info", jsonData, data.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 5, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(null, data.CaseSerial, data.CliengGuid, EMaterialType.Visit, data.AreaCode, cancellationToken);
|
|
@@ -1681,7 +1681,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitCaseResult", "submit_case_result", jsonData, pathType: EPathType.HuiJu, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitCaseResult", "submit_case_result", jsonData, data.CaseSerial, pathType: EPathType.HuiJu, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
if (dto.WorkflowTrace != null && dto.WorkflowTrace.FileJson != null && dto.WorkflowTrace.FileJson.Count > 0)
|
|
@@ -1867,7 +1867,7 @@ namespace DataSharing.Application.Receivers
|
|
|
#endregion
|
|
|
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SubmitCaseExtends", "submit_case_extends", jsonData, pathType: EPathType.HuiJu, GenerationTime: dto.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SubmitCaseExtends", "submit_case_extends", jsonData, submitCaseExtendsInfo.CaseSerial, pathType: EPathType.HuiJu, GenerationTime: dto.StartTime, cancellationToken: cancellationToken);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -1970,7 +1970,7 @@ namespace DataSharing.Application.Receivers
|
|
|
var url = configProvince.HuiJu + "send_case_info";
|
|
|
#endregion
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("SendCaseInfo", "send_case_info", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.StartTime, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("SendCaseInfo", "send_case_info", jsonData, sendCaseInfo.CaseSerial, pathType: EPathType.XieTong, GenerationTime: dto.StartTime, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
await FileDataAsync(dto.FileJson, dto.ProvinceNo, sendCaseInfoData.CliengGuid, EMaterialType.Acceptance, sendCaseInfoData.AreaCode, cancellationToken);
|
|
@@ -2019,7 +2019,7 @@ namespace DataSharing.Application.Receivers
|
|
|
List<FileJson> fileJsons = new() { _mapper.Map<FileJson>(item) };
|
|
|
|
|
|
//待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("GetCaseMaterialInfo", "get_case_material_info", jsonData, pathType: EPathType.File, fileJson: fileJsons, cancellationToken: cancellationToken);
|
|
|
+ await InitPushDataAsync("GetCaseMaterialInfo", "get_case_material_info", jsonData, materialInfo.CaseSerial, pathType: EPathType.File, fileJson: fileJsons, cancellationToken: cancellationToken);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -2317,7 +2317,7 @@ namespace DataSharing.Application.Receivers
|
|
|
};
|
|
|
|
|
|
//写入待推送数据
|
|
|
- var snedTaskId = await InitPushDataAsync("InitCityDataYB", "CityHandOver.asmx/FlowWrite", System.Text.Json.JsonSerializer.Serialize(dicParam), platformSource: EPlatformSource.CityDataExchange, cancellationToken: cancellationToken);
|
|
|
+ var snedTaskId = await InitPushDataAsync("InitCityDataYB", "CityHandOver.asmx/FlowWrite", System.Text.Json.JsonSerializer.Serialize(dicParam), dto.ProvinceNo, platformSource: EPlatformSource.CityDataExchange, cancellationToken: cancellationToken);
|
|
|
|
|
|
var dataRow = new DsReceiveDataExchangeData()
|
|
|
{
|
|
@@ -2342,7 +2342,7 @@ namespace DataSharing.Application.Receivers
|
|
|
var fileJson = _mapper.Map<List<FileJson>>(dto.FileJson);
|
|
|
var configEnterprise = _channelConfigurationManager.GetConfigurationEnterprise();
|
|
|
//将待推送数据写入待推送表
|
|
|
- await InitPushDataAsync("EnterprisePushWorkOrder", YbEnterpriseDefaults.PathEnterprisesWorkOrder, System.Text.Json.JsonSerializer.Serialize(enterpriseData),
|
|
|
+ await InitPushDataAsync("EnterprisePushWorkOrder", YbEnterpriseDefaults.PathEnterprisesWorkOrder, System.Text.Json.JsonSerializer.Serialize(enterpriseData), dto.ProvinceNo,
|
|
|
platformSource: EPlatformSource.Enterprise, fileJson: fileJson, cancellationToken: cancellationToken);
|
|
|
|
|
|
}
|
|
@@ -2354,6 +2354,7 @@ namespace DataSharing.Application.Receivers
|
|
|
/// <param name="taskType">任务类型</param>
|
|
|
/// <param name="path">请求地址</param>
|
|
|
/// <param name="request">请求参数</param>
|
|
|
+ /// <param name="ProvinceNo">省编号</param>
|
|
|
/// <param name="pathType"></param>
|
|
|
/// <param name="cancellationToken"></param>
|
|
|
/// <param name="httpMethod">请求方式</param>
|
|
@@ -2361,7 +2362,7 @@ namespace DataSharing.Application.Receivers
|
|
|
/// <param name="taskPriority">任务优先级(0:最低级别)</param>
|
|
|
/// <param name="fileJson">附件</param>
|
|
|
/// <returns></returns>
|
|
|
- private async Task<string> InitPushDataAsync(string taskType, string path, string request,
|
|
|
+ private async Task<string> InitPushDataAsync(string taskType, string path, string request, string ProvinceNo,
|
|
|
string httpMethod = "Post",
|
|
|
EPlatformSource platformSource = EPlatformSource.Province,
|
|
|
EPathType pathType = EPathType.Other,
|
|
@@ -2373,6 +2374,7 @@ namespace DataSharing.Application.Receivers
|
|
|
//组装参数
|
|
|
DsSendTask dsSendTask = new()
|
|
|
{
|
|
|
+ ProvinceNo = ProvinceNo,
|
|
|
TaskPriority = taskPriority,
|
|
|
TaskType = taskType,
|
|
|
HttpMethod = httpMethod,
|