src/DataSharing/Province/PusherProviderService.cs

@@ -8,6 +8,7 @@ using MapsterMapper;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Net;
+using System.Reflection.Metadata.Ecma335;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
@@ -76,43 +77,61 @@ namespace DataSharing.Province
             if (dto is null)
                 return;
 
-            ProvinceResponse result = new();
-            var configProvince = _channelConfigurationManager.GetConfigurationProvince();
+            var name = GetName(dto.Path);
             if (dto.PathType == EPathType.HuiJu) //汇聚推送
-                result = await _huiJuClient.RequestAsync<ProvinceResponse>(configProvince.HuiJu + dto.Path, dto.HttpMethod, dto.Request, cancellationToken);
-
+            {
+                _logger.LogInformation(name, dto.Request);
+            }
             else if (dto.PathType == EPathType.XieTong)//协同推送
-                result = await _xieTongClient.RequestAsync<ProvinceResponse>(configProvince.XieTong + dto.Path, dto.HttpMethod, dto.Request, cancellationToken);
-
+            {
+                _logger.LogInformation(name, dto.Request);
+            }
             else if (dto.PathType == EPathType.File)  //附件
             {
                 if (dto != null && dto.FileJson != null && dto.FileJson.Count > 0)
                 {
-                    var itemFile = dto.FileJson[0];
-                    result = await SendFileData(dto.Request, itemFile.FileId, itemFile.FileId, cancellationToken);
+                    _logger.LogInformation(name, dto.Request);
                 }
             }
 
-            if (result is not null)
-            {
-                //写入明细表
-                DsSendTaskInfo dsSendTaskInfo = new() { TaskId = dto.Id, Result = result };
 
-                //看看需不需要处理一些信息
-                dto.LastTime = DateTime.Now;
-                dto.SendTimes = dto.SendTimes++;
+            //ProvinceResponse result = new();
+            //var configProvince = _channelConfigurationManager.GetConfigurationProvince();
+            //if (dto.PathType == EPathType.HuiJu) //汇聚推送
+            //    result = await _huiJuClient.RequestAsync<ProvinceResponse>(configProvince.HuiJu + dto.Path, dto.HttpMethod, dto.Request, cancellationToken);
 
-                if (dto.FirstTime is null)
-                    dto.FirstTime = DateTime.Now;
+            //else if (dto.PathType == EPathType.XieTong)//协同推送
+            //    result = await _xieTongClient.RequestAsync<ProvinceResponse>(configProvince.XieTong + dto.Path, dto.HttpMethod, dto.Request, cancellationToken);
 
-                if (result.ReturnInfo is not null && result.ReturnInfo.Code == "1")
-                {
-                    dto.IsSuccess = true;
-                    dsSendTaskInfo.IsSuccess = true;
-                }
-                await _dsSendTaskInfoRepository.AddAsync(dsSendTaskInfo, cancellationToken);
-                await _dsSendTaskRepository.UpdateAsync(dto, cancellationToken);
-            }
+            //else if (dto.PathType == EPathType.File)  //附件
+            //{
+            //    if (dto != null && dto.FileJson != null && dto.FileJson.Count > 0)
+            //    {
+            //        var itemFile = dto.FileJson[0];
+            //        result = await SendFileData(dto.Request, itemFile.FileId, itemFile.FileId, cancellationToken);
+            //    }
+            //}
+
+            //if (result is not null)
+            //{
+            //    //写入明细表
+            //    DsSendTaskInfo dsSendTaskInfo = new() { TaskId = dto.Id, Result = result };
+
+            //    //看看需不需要处理一些信息
+            //    dto.LastTime = DateTime.Now;
+            //    dto.SendTimes = dto.SendTimes++;
+
+            //    if (dto.FirstTime is null)
+            //        dto.FirstTime = DateTime.Now;
+
+            //    if (result.ReturnInfo is not null && result.ReturnInfo.Code == "1")
+            //    {
+            //        dto.IsSuccess = true;
+            //        dsSendTaskInfo.IsSuccess = true;
+            //    }
+            //    await _dsSendTaskInfoRepository.AddAsync(dsSendTaskInfo, cancellationToken);
+            //    await _dsSendTaskRepository.UpdateAsync(dto, cancellationToken);
+            //}
         }
 
 
@@ -242,5 +261,97 @@ namespace DataSharing.Province
                 return new ProvinceResponse();
             }
         }
+
+        /// <summary>
+        /// 获取接口名称
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        private string GetName(string path)
+        {
+            string name = "";
+            switch (path)
+            {
+                case "get_case_back_apply":
+                    name = "业务协同-退回申请接口";
+                    break;
+                case "send_supervise_process_info":
+                    name = "业务协同-服务工单督办过程接口";
+                    break;
+                case "send_supervise_result_info":
+                    name = "业务协同-服务工单督办结果接口";
+                    break;
+                case "screen_case_info_send":
+                    name = "业务协同-工单发起甄别接口";
+                    break;
+                case "delay_case_info_send":
+                    name = "业务协同-服务工单申请延时接口";
+                    break;
+                case "submit_case_info":
+                    name = "业务汇聚-服务工单受理接口";
+                    break;
+                case "submit_case_record":
+                    name = "业务汇聚-电话记录";
+                    break;
+                case "get_case_process_receive":
+                    name = "业务协同-服务工单交办处理过程接口";
+                    break;
+                case "submit_case_process":
+                    name = "业务汇聚-服务工单处理过程接口";
+                    break;
+                case "submit_case_total":
+                    name = "业务汇聚-统计数据接口";
+                    break;
+                case "supply_case_info_send":
+                    name = "业务协同-上报补充诉求接口";
+                    break;
+                case "revoke_case_info":
+                    name = "业务协同-服务工单撤单接口";
+                    break;
+                case "remind_case_info":
+                    name = "业务协同-服务工单催单接口";
+                    break;
+                case "get_case_result_receive":
+                    name = "业务协同-服务工单交办处理结果接口";
+                    break;
+                case "zmhd_case_info_public":
+                    name = "业务协同-政民互动提交公开";
+                    break;
+                case "get_knowledge_info_send":
+                    name = "业务协同-知识库上报接口";
+                    break;
+                case "get_knowledge_info_update":
+                    name = "业务协同-知识库变更接口";
+                    break;
+                case "get_knowledge_info_abandon":
+                    name = "业务协同-知识库下架接口";
+                    break;
+                case "sendrealtimestatus":
+                    name = "实时服务上报接口";
+                    break;
+                case "get_visit_info_receive":
+                    name = "业务协同-服务工单交办评价接口";
+                    break;
+                case "submit_visit_info":
+                    name = "业务汇聚-服务工单回访评价接口";
+                    break;
+                case "submit_case_result":
+                    name = "业务汇聚-服务工单处理结果接口";
+                    break;
+                case "submit_case_extends":
+                    name = "业务汇聚-服务工单拓展信息接口";
+                    break;
+                case "send_case_info":
+                    name = "业务协同-服务工单上报";
+                    break;
+                case "get_case_material_info":
+                    name = "业务协同-材料接口";
+                    break;
+                default:
+                    break;
+            }
+
+            return name;
+        }
     }
 }

src/DataSharing/SendTask/TaskExecuteJob.cs

@@ -33,8 +33,8 @@ namespace DataSharing.SendTask
             var task = await _queue.DequeueAsync<DsSendTask>(SendTaskDefaults.SendTaskQueue, context.CancellationToken);
             if (task is not null)
             {
-                if (task.PlatformSource == Share.Enums.EPlatformSource.CityDataExchange)
-                    await _sendTaskDataService.SendTask(task, context.CancellationToken);
+                //    if (task.PlatformSource == Share.Enums.EPlatformSource.CityDataExchange)
+                await _sendTaskDataService.SendTask(task, context.CancellationToken);
                 _logger.LogInformation($"send task execute, taskId: {task.Id}");
             }
         }