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

@@ -69,6 +69,8 @@
 
   //系统配置
   "ChannelConfiguration": {
+    "ProcessingServices": "Services1", //服务名称
+
     //业务系统推送工单
     "HotlineClient": {
       "AddressUrl": "http://localhost:50100/"

src/DataSharing.Host/config/appsettings.json

@@ -73,8 +73,11 @@
     "Namespace": "f5017bc5-af0a-4f85-8e38-6718accc8f36", //dev
     "ServiceName": "hotline"
   },
+
   //系统配置
   "ChannelConfiguration": {
+    "ProcessingServices": "Services1", //服务名称
+
     //业务系统推送工单
     "HotlineClient": {
       "AddressUrl": "http://localhost:50100/"
@@ -104,6 +107,7 @@
   "SharingConfiguration": {
     "CityCode": "511500", //系统市州编码
     "CityName": "宜宾市", //系统市州名称
+    "HotlineName": "宜宾12345",
     "ProvinceOrgCode": "001171", //省12345平台部门Code
     "ProvinceAssignmentOrgCode": "001178", //省12345交办部门Code
     "PoliceOrgCode": "001180", //110部门Code
@@ -117,6 +121,7 @@
         "ClientSecret": "6nZtVK4rKfnsncGymUHB",
         "TenantId": "000000"
       },
+
       //市州数据交换
       "CityHandOver": {
         "PushOrder": "CityHandOver.asmx/FlowWrite",
@@ -203,23 +208,6 @@
 
     //自贡
     "CityZiGong": {
-      //市州数据交换
-      "CityHandOver": {
-        "PushOrder": "CityHandOver.asmx/FlowWrite",
-        "PushOpinion": "CityHandOver.asmx/UndertakAdvice",
-        "NewPushOrder": "api/v1/CityDataExchange/city_hand_data",
-        "NewPushOpinion": "api/v1/CityDataExchange/city_undertak_advice_data",
-        "IsNew": true
-      },
-
-      //新老数据交换配置
-      "SendDataOld": {
-        "AddressUrl": "http://192.168.100.195:8066/",
-        "ClientID": "admin",
-        "Secret": "123456",
-        "IsSend": false
-      },
-
       //110对接--大成均图
       "PoliceDCJT": {
         "GXDWDM": "510300000000",

src/DataSharing.YiBin/Enterprise/EnterprisePusherProviderService.cs

@@ -130,7 +130,12 @@ namespace DataSharing.YiBin.Enterprise
 
             var enterprise = await _enterpriseClient.RequestAsync<EnterpriseResponse>(baseAddress + dto.Path, dto.HttpMethod, request, cancellationToken);
             //写入推送明细表
-            DsSendTaskDetailInfo dsSendTaskInfo = new() { TaskId = dto.Id, Result = System.Text.Json.JsonSerializer.Serialize(enterprise) };
+            DsSendTaskDetailInfo dsSendTaskInfo = new()
+            {
+                TaskId = dto.Id,
+                Result = System.Text.Json.JsonSerializer.Serialize(enterprise),
+                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
+            };
             //如果推送成功修改数据状态
             if (enterprise != null)
             {
@@ -139,7 +144,7 @@ namespace DataSharing.YiBin.Enterprise
                 if (enterprise.code == 200 && enterprise.success)
                 {
                     dsSendTaskInfo.IsSuccess = true;
-                    await _waitSendTaskOtherPlatformsRepository.RemoveAsync( dto, cancellationToken: cancellationToken);
+                    await _waitSendTaskOtherPlatformsRepository.RemoveAsync(dto, cancellationToken: cancellationToken);
                 }
                 else
                 {

src/DataSharing.YiBin/ZzptPlatformsYB/ZzptPusherProviderService.cs

@@ -18,6 +18,7 @@ namespace DataSharing.YiBin.ZzptPlatformsYB
         private readonly IRepository<DsWaitSendTaskOtherPlatforms> _waitSendTaskOtherPlatformsRepository;
         private readonly IRepository<DsSendTaskDetailInfo> _dsSendTaskInfoRepository;
         private readonly IRepository<DsSendTaskOtherPlatforms> _sendTaskOtherPlatformsRepository;
+        private readonly IChannelConfigurationManager _channelConfigurationManager;
 
         /// <summary>
         /// 
@@ -27,17 +28,20 @@ namespace DataSharing.YiBin.ZzptPlatformsYB
         /// <param name="waitSendTaskOtherPlatformsRepository"></param>
         /// <param name="dsSendTaskInfoRepository"></param>
         /// <param name="sendTaskOtherPlatformsRepository"></param>
+        /// <param name="channelConfigurationManager"></param>
         public ZzptPusherProviderService(ILogger<ZzptPusherProviderService> logger,
             IRepository<DsUserTokenInfo> dsUserTokenInfoRepository,
             IRepository<DsWaitSendTaskOtherPlatforms> waitSendTaskOtherPlatformsRepository,
             IRepository<DsSendTaskDetailInfo> dsSendTaskInfoRepository,
-            IRepository<DsSendTaskOtherPlatforms> sendTaskOtherPlatformsRepository)
+            IRepository<DsSendTaskOtherPlatforms> sendTaskOtherPlatformsRepository,
+            IChannelConfigurationManager channelConfigurationManager)
         {
             _logger = logger;
             _dsUserTokenInfoRepository = dsUserTokenInfoRepository;
             _waitSendTaskOtherPlatformsRepository = waitSendTaskOtherPlatformsRepository;
             _dsSendTaskInfoRepository = dsSendTaskInfoRepository;
             _sendTaskOtherPlatformsRepository = sendTaskOtherPlatformsRepository;
+            _channelConfigurationManager = channelConfigurationManager;
         }
 
         /// <summary>
@@ -68,7 +72,12 @@ namespace DataSharing.YiBin.ZzptPlatformsYB
             string strResultJson = PostWebServiceByJson(baseAddress + dto.Path, dto.HttpMethod, dicParam);
 
             //写入推送明细表
-            DsSendTaskDetailInfo dsSendTaskInfo = new() { TaskId = dto.Id, Result = strResultJson };
+            DsSendTaskDetailInfo dsSendTaskInfo = new()
+            {
+                TaskId = dto.Id,
+                Result = strResultJson,
+                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
+            };
             if (false == string.IsNullOrEmpty(strResultJson))
             {
                 var respone = System.Text.Json.JsonSerializer.Deserialize<ZzptDeResponse>(strResultJson);
@@ -79,7 +88,7 @@ namespace DataSharing.YiBin.ZzptPlatformsYB
                     if (respone.code)
                     {
                         dsSendTaskInfo.IsSuccess = true;
-                        await _waitSendTaskOtherPlatformsRepository.RemoveAsync( dto, cancellationToken: cancellationToken);
+                        await _waitSendTaskOtherPlatformsRepository.RemoveAsync(dto, cancellationToken: cancellationToken);
                     }
                     else
                     {

src/DataSharing/ChannelConfiguration.cs

@@ -2,6 +2,11 @@
 {
     public class ChannelConfiguration
     {
+        /// <summary>
+        /// 服务名称
+        /// </summary>
+        public string ProcessingServices { get; set; }
+
         /// <summary>
         /// 业务系统附件上传配置
         /// </summary>

src/DataSharing/ChannelConfigurationManager.cs

@@ -19,6 +19,15 @@ namespace DataSharing
             _channelOption = channelOption;
         }
 
+        /// <summary>
+        /// 获取服务名称
+        /// </summary>
+        /// <returns></returns>
+        public string GetConfigurationProcessingServices()
+        {
+            return _channelOption.Value.ProcessingServices;
+        }
+
         /// <summary>
         /// 业务系统附件上传配置
         /// </summary>

src/DataSharing/CityStateDataExchange/CityStateDataExchangePusherProviderService.cs

@@ -19,6 +19,7 @@ namespace DataSharing.CityStateDataExchange
         private readonly IRepository<DsSendTaskDetailInfo> _dsSendTaskInfoRepository;
         private readonly IRepository<DsUserTokenInfo> _dsUserTokenInfoRepository;
         private readonly IRepository<DsSendTaskOtherPlatforms> _sendTaskOtherPlatformsRepository;
+        private readonly IChannelConfigurationManager _channelConfigurationManager;
 
         /// <summary>
         /// 
@@ -29,13 +30,16 @@ namespace DataSharing.CityStateDataExchange
         /// <param name="capPublisher"></param>
         /// <param name="dsSendTaskInfoRepository"></param>
         /// <param name="dsUserTokenInfoRepository"></param>
+        /// <param name="sendTaskOtherPlatformsRepository"></param>
+        /// <param name="channelConfigurationManager"></param>
         public CityStateDataExchangePusherProviderService(ILogger<CityStateDataExchangePusherProviderService> logger,
              CityStateDataExchangeClient dataExchangeClient,
             IRepository<DsWaitSendTaskOtherPlatforms> dsSendTaskRepository,
             ICapPublisher capPublisher,
             IRepository<DsSendTaskDetailInfo> dsSendTaskInfoRepository,
             IRepository<DsUserTokenInfo> dsUserTokenInfoRepository,
-            IRepository<DsSendTaskOtherPlatforms> sendTaskOtherPlatformsRepository)
+            IRepository<DsSendTaskOtherPlatforms> sendTaskOtherPlatformsRepository,
+            IChannelConfigurationManager channelConfigurationManager)
         {
             _logger = logger;
             _dataExchangeClient = dataExchangeClient;
@@ -44,6 +48,7 @@ namespace DataSharing.CityStateDataExchange
             _dsSendTaskInfoRepository = dsSendTaskInfoRepository;
             _dsUserTokenInfoRepository = dsUserTokenInfoRepository;
             _sendTaskOtherPlatformsRepository = sendTaskOtherPlatformsRepository;
+            _channelConfigurationManager = channelConfigurationManager;
         }
 
         /// <summary>
@@ -71,7 +76,8 @@ namespace DataSharing.CityStateDataExchange
             DsSendTaskDetailInfo dsSendTaskInfo = new()
             {
                 TaskId = dto.Id,
-                Result = System.Text.Json.JsonSerializer.Serialize(response)
+                Result = System.Text.Json.JsonSerializer.Serialize(response),
+                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
             };
 
             //如果推送成功修改数据状态
@@ -81,7 +87,7 @@ namespace DataSharing.CityStateDataExchange
                 //处理待推送数据，如果返回成功则直接删除数据，返回失败更新数据
                 if (response.Code == "1")
                 {
-                    await _dsSendTaskRepository.RemoveAsync( dto, cancellationToken: cancellationToken);
+                    await _dsSendTaskRepository.RemoveAsync(dto, cancellationToken: cancellationToken);
                 }
                 else
                 {

src/DataSharing/IChannelConfigurationManager.cs

@@ -2,6 +2,12 @@
 {
     public interface IChannelConfigurationManager
     {
+        /// <summary>
+        /// 获取服务名称
+        /// </summary>
+        /// <returns></returns>
+        string GetConfigurationProcessingServices();
+
         /// <summary>
         /// 业务系统附件上传配置
         /// </summary>

src/DataSharing/Province/SendTask/TaskProvinceOtherJob.cs

@@ -122,7 +122,13 @@ namespace DataSharing.Province.SendTask
                         _logger.LogWarning("省接口返回：" + name + "--------------" + System.Text.Json.JsonSerializer.Serialize(result));
 
                         //写入明细表
-                        DsSendTaskDetailInfo dsSendTaskInfo = new() { TaskId = sendTask.Id, Result = System.Text.Json.JsonSerializer.Serialize(result), ResultErrorData = error };
+                        DsSendTaskDetailInfo dsSendTaskInfo = new()
+                        {
+                            TaskId = sendTask.Id,
+                            Result = System.Text.Json.JsonSerializer.Serialize(result),
+                            ResultErrorData = error,
+                            ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
+                        };
                         if (result is not null)
                         {
                             #region 处理待同步表数据

src/DataSharing/Province/SendTask/TaskSubmitCaseInfoJob.cs

@@ -181,6 +181,7 @@ namespace DataSharing.Province.SendTask
                                 IsSuccess = !isError,
                                 Result = JsonSerializer.Serialize(result),
                                 ResultErrorData = error,
+                                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
                             };
                             await _sendTaskDetailInfoRepository.AddAsync(dsSendTaskDetailInfo, context.CancellationToken);
                             #endregion

src/DataSharing/Province/SendTask/TaskSubmitCaseProcessJob.cs

@@ -167,6 +167,7 @@ namespace DataSharing.Province.SendTask
                                 IsSuccess = !isError,
                                 Result = JsonSerializer.Serialize(result),
                                 ResultErrorData = error,
+                                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
                             };
                             await _sendTaskDetailInfoRepository.AddAsync(dsSendTaskDetailInfo, context.CancellationToken);
 

src/DataSharing/Province/SendTask/TaskSubmitCaseRecordJob.cs

@@ -178,6 +178,7 @@ namespace DataSharing.Province.SendTask
                                 IsSuccess = !isError,
                                 Result = JsonSerializer.Serialize(result),
                                 ResultErrorData = error,
+                                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
                             };
                             await _sendTaskDetailInfoRepository.AddAsync(dsSendTaskDetailInfo, context.CancellationToken);
                             #endregion

src/DataSharing/Province/SendTask/TaskSubmitCaseResultJob.cs

@@ -167,6 +167,7 @@ namespace DataSharing.Province.SendTask
                                 IsSuccess = !isError,
                                 Result = JsonSerializer.Serialize(result),
                                 ResultErrorData = error,
+                                ProcessingServices = _channelConfigurationManager.GetConfigurationProcessingServices()
                             };
                             await _sendTaskDetailInfoRepository.AddAsync(dsSendTaskDetailInfo, context.CancellationToken);
                         }

src/DataSharing/SendTask/DsSendTaskDetailInfo.cs

@@ -33,5 +33,11 @@ namespace DataSharing.SendTask
         /// </summary>
         [SugarColumn(ColumnDataType = "text", IsNullable = true, ColumnDescription = "返回错误消息")]
         public string? ResultErrorData { get; set; }
+
+        /// <summary>
+        /// 读取服务名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "读取服务名称")]
+        public string? ProcessingServices { get; set; }
     }
 }

src/DataSharing/SendTask/TaskOtherPlatformsJob.cs

@@ -16,6 +16,7 @@ namespace DataSharing.SendTask
         private readonly ILogger<TaskOtherPlatformsJob> _logger;
         private readonly IRepository<DsWaitSendTaskOtherPlatforms> _waitSendTaskOtherPlatformsRepository;
         private readonly ISendTaskDataService _sendTaskDataService;
+        private readonly IChannelConfigurationManager _channelConfigurationManager;
 
         /// <summary>
         /// 
@@ -23,15 +24,19 @@ namespace DataSharing.SendTask
         /// <param name="mapper"></param>
         /// <param name="logger"></param>
         /// <param name="waitSendTaskOtherPlatformsRepository"></param>
+        /// <param name="sendTaskDataService"></param>
+        /// <param name="channelConfigurationManager"></param>
         public TaskOtherPlatformsJob(IMapper mapper,
             ILogger<TaskOtherPlatformsJob> logger,
             IRepository<DsWaitSendTaskOtherPlatforms> waitSendTaskOtherPlatformsRepository,
-            ISendTaskDataService sendTaskDataService)
+            ISendTaskDataService sendTaskDataService,
+            IChannelConfigurationManager channelConfigurationManager)
         {
             _mapper = mapper;
             _logger = logger;
             _waitSendTaskOtherPlatformsRepository = waitSendTaskOtherPlatformsRepository;
             _sendTaskDataService = sendTaskDataService;
+            _channelConfigurationManager = channelConfigurationManager;
         }
 
         /// <summary>
@@ -47,6 +52,7 @@ namespace DataSharing.SendTask
                .OrderBy(d => d.CreationTime)
                .Take(100)
                .ToListAsync(context.CancellationToken);
+            _logger.LogWarning("其他平台读取数据条数--------------------------------------" + tasks.Count);
             if (tasks.Count != 0)
             {
                 //处理推送数据