增减原始数据查看接口

src/DataSharing.Host/Controllers/CityDataExchangeController.cs

@@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Mvc;
 using System.Security.Cryptography;
 using System.Text;
 using System.Web;
-using XF.Domain.Authentications;
 using XF.Domain.Filters;
 using XF.Domain.Repository;
 
@@ -81,6 +80,7 @@ namespace DataSharing.Host.Controllers
             {
                 ExternalId = dto.No,
                 ServiceInterface = "city_exchange_add_order",
+                PlatformsName = _sessionContext.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
             };
             await _dsReceiveDataExchangeDataRepository.AddAsync(data, HttpContext.RequestAborted);
@@ -159,6 +159,7 @@ namespace DataSharing.Host.Controllers
             {
                 ExternalId = dto.ExternalId,
                 ServiceInterface = "city_exchange_add_opinion",
+                PlatformsName = _sessionContext.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
             };
             await _dsReceiveDataExchangeDataRepository.AddAsync(data, HttpContext.RequestAborted);
@@ -214,6 +215,7 @@ namespace DataSharing.Host.Controllers
             {
                 ExternalId = dto.FSHCode,
                 ServiceInterface = "city_hand_data",
+                PlatformsName = userInfo.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
             };
             data.Id = await _dsReceiveDataExchangeDataRepository.AddAsync(data, HttpContext.RequestAborted);
@@ -300,6 +302,7 @@ namespace DataSharing.Host.Controllers
             {
                 ExternalId = dto.SCDRCode,
                 ServiceInterface = "city_undertak_advice_data",
+                PlatformsName = userInfo.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
             };
             await _dsReceiveDataExchangeDataRepository.AddAsync(data, HttpContext.RequestAborted);

src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -1,5 +1,7 @@
-using DataSharing.FwDataExchange;
+using DataSharing.CityStateDataExchange;
+using DataSharing.FwDataExchange;
 using DataSharing.HotlineWeb;
+using DataSharing.Police110.DaoShu110;
 using DataSharing.Province;
 using DataSharing.Province.SendTask;
 using DataSharing.Province.SendTask.ProvinceOther;
@@ -18,6 +20,8 @@ using DataSharing.Share.Dtos.HotlineSetting;
 using DataSharing.Share.Dtos.HotlineWeb;
 using DataSharing.Share.Enums;
 using DataSharing.Share.Requests;
+using DataSharing.YiBin.ConvergenceMedia;
+using DataSharing.YiBin.Enterprise;
 using DotNetCore.CAP;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Order;
@@ -26,6 +30,7 @@ using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
+using StackExchange.Redis;
 using System.Security.Cryptography;
 using System.Text;
 using XC.RSAUtil;
@@ -41,40 +46,6 @@ namespace DataSharing.Host.Controllers
     public class HotlineWebController : BaseController
     {
         #region 注入
-        private readonly IMapper _mapper;
-        private readonly IMediator _mediator;
-        private readonly ICapPublisher _capPublisher;
-        private readonly IRepository<DsOrderSend> _dsOrderSendRepository;
-        private readonly IRepository<DsTelCall> _dsTelCallRepository;
-        private readonly IRepository<ConfigurationInformation> _configurationInformationRepository;
-        private readonly ITypedCache<ConfigurationInformationDto> _configurationInformationCache;
-        private readonly IRepository<DsOrderVisitSend> _dsOrderVisitSendRepository;
-        private readonly IRepository<DsKnowledgeRawData> _knowledgeRawDataRepository;
-        private readonly IRepository<DsUserTokenInfo> _dsUserTokenInfoRepository;
-        private readonly IRepository<DsWaitSendTaskProvinceOther> _waitSendTaskProvinceOtherRepository;
-        private readonly IRepository<DsSendTaskProvinceOther> _sendTaskProvinceOtherRepository;
-        private readonly IRepository<DsWaitSendTaskSubmitCaseInfo> _waitSendTaskSubmitCaseInfoRepository;
-        private readonly IRepository<DsSendTaskSubmitCaseInfo> _sendTaskSubmitCaseInfoRepository;
-        private readonly IRepository<DsWaitSendTaskSubmitCaseProcess> _waitSendTaskSubmitCaseProcessRepository;
-        private readonly IRepository<DsSendTaskSubmitCaseProcess> _sendTaskSubmitCaseProcessRepository;
-        private readonly IRepository<DsWaitSendTaskSubmitCaseRecord> _waitSendTaskSubmitCaseRecordRepository;
-        private readonly IRepository<DsSendTaskSubmitCaseRecord> _sendTaskSubmitCaseRecordRepository;
-        private readonly IRepository<DsWaitSendTaskSubmitCaseResult> _waitSendTaskSubmitCaseResultRepository;
-        private readonly IRepository<DsSendTaskSubmitCaseResult> _sendTaskSubmitCaseResultRepository;
-        private readonly IWaitSendTaskRepository _waitSendTaskRepository;
-        private readonly IRepository<DsSendTaskDetailInfo> _sendTaskDetailInfoRepository;
-        private readonly IRepository<DsWaitSendTaskOtherPlatforms> _waitSendTaskOtherPlatformsRepository;
-        private readonly IRepository<DsSendTaskOtherPlatforms> _sendTaskOtherPlatformsRepository;
-        private readonly IInitPushDataService _initPushDataService;
-        private readonly IRepository<DsSendTask> _taskRepository;
-        private readonly IRepository<DsSendTaskInfo> _taskInfoRepository;
-        private readonly IRepository<DsOrder> _dsOrderRepository;
-        private readonly IRepository<SendHotlineErrorData> _sendHotlineErrorDataRepository;
-        private readonly FwClient _fwClient;
-        private readonly ISharingConfigurationManager _sharingConfigurationManager;
-        private readonly IRepository<UserOperationLog> _userOperationLogRepository;
-        private readonly IRepository<SendFwErrorData> _sendFwErrorDataRepository;
-        private readonly IRepository<DsGetCaseMaterialInfo> _getCaseMaterialInfoRepository;
         private const string PublicKey = @"-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgw+/x6IQPkH0A4eoF63j
 kLThsOXWyNBdcL9LATGy/G1yTHOr1RyKJB//iNug+V8DIoIHuFTlhgLHDbSqxvRW
@@ -111,44 +82,46 @@ qAsDkLg3nhCLvvyWAsDyVdNiZDL1J6ZBA3Qoi8P2xFWSApB+ryDPs3YOtiH0QZui
 Q9PP8NTEmKqdI3WVFYqW/OlOFC6sjiscTOOn9Tc5Mrcn8ocCjAPjkhkCCVRMiJnv
 jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 -----END RSA PRIVATE KEY-----";
+        private readonly IMapper _mapper;
+        private readonly IMediator _mediator;
+        private readonly ICapPublisher _capPublisher;
+        private readonly IRepository<DsOrderSend> _dsOrderSendRepository;
+        private readonly IRepository<DsTelCall> _dsTelCallRepository;
+        private readonly IRepository<ConfigurationInformation> _configurationInformationRepository;
+        private readonly ITypedCache<ConfigurationInformationDto> _configurationInformationCache;
+        private readonly IRepository<DsOrderVisitSend> _dsOrderVisitSendRepository;
+        private readonly IRepository<DsKnowledgeRawData> _knowledgeRawDataRepository;
+        private readonly IRepository<DsUserTokenInfo> _dsUserTokenInfoRepository;
+        private readonly IRepository<DsWaitSendTaskProvinceOther> _waitSendTaskProvinceOtherRepository;
+        private readonly IRepository<DsSendTaskProvinceOther> _sendTaskProvinceOtherRepository;
+        private readonly IRepository<DsWaitSendTaskSubmitCaseInfo> _waitSendTaskSubmitCaseInfoRepository;
+        private readonly IRepository<DsSendTaskSubmitCaseInfo> _sendTaskSubmitCaseInfoRepository;
+        private readonly IRepository<DsWaitSendTaskSubmitCaseProcess> _waitSendTaskSubmitCaseProcessRepository;
+        private readonly IRepository<DsSendTaskSubmitCaseProcess> _sendTaskSubmitCaseProcessRepository;
+        private readonly IRepository<DsWaitSendTaskSubmitCaseRecord> _waitSendTaskSubmitCaseRecordRepository;
+        private readonly IRepository<DsSendTaskSubmitCaseRecord> _sendTaskSubmitCaseRecordRepository;
+        private readonly IRepository<DsWaitSendTaskSubmitCaseResult> _waitSendTaskSubmitCaseResultRepository;
+        private readonly IRepository<DsSendTaskSubmitCaseResult> _sendTaskSubmitCaseResultRepository;
+        private readonly IWaitSendTaskRepository _waitSendTaskRepository;
+        private readonly IRepository<DsSendTaskDetailInfo> _sendTaskDetailInfoRepository;
+        private readonly IRepository<DsWaitSendTaskOtherPlatforms> _waitSendTaskOtherPlatformsRepository;
+        private readonly IRepository<DsSendTaskOtherPlatforms> _sendTaskOtherPlatformsRepository;
+        private readonly IInitPushDataService _initPushDataService;
+        private readonly IRepository<DsSendTask> _taskRepository;
+        private readonly IRepository<DsSendTaskInfo> _taskInfoRepository;
+        private readonly IRepository<DsOrder> _dsOrderRepository;
+        private readonly IRepository<SendHotlineErrorData> _sendHotlineErrorDataRepository;
+        private readonly FwClient _fwClient;
+        private readonly ISharingConfigurationManager _sharingConfigurationManager;
+        private readonly IRepository<UserOperationLog> _userOperationLogRepository;
+        private readonly IRepository<SendFwErrorData> _sendFwErrorDataRepository;
+        private readonly IRepository<DsGetCaseMaterialInfo> _getCaseMaterialInfoRepository;
+        private readonly IRepository<DsReceiveDataExchangeData> _dsReceiveDataExchangeDataRepository;
+        private readonly IRepository<DsReceiveEnterpriseData> _dsReceiveEnterpriseDataRepository;
+        private readonly IRepository<DsReceiveMediaData> _dsReceiveMediaDataRepository;
+        private readonly IRepository<DsReceivePoliceData> _dsReceivePoliceDataRepository;
+
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="mapper"></param>
-        /// <param name="mediator"></param>
-        /// <param name="capPublisher"></param>
-        /// <param name="dsOrderSendRepository"></param>
-        /// <param name="dsTelCallRepository"></param>
-        /// <param name="configurationInformationRepository"></param>
-        /// <param name="configurationInformationCache"></param>
-        /// <param name="dsOrderVisitSendRepository"></param>
-        /// <param name="knowledgeRawDataRepository"></param>
-        /// <param name="dsUserTokenInfoRepository"></param>
-        /// <param name="waitSendTaskProvinceOtherRepository"></param>
-        /// <param name="sendTaskProvinceOtherRepository"></param>
-        /// <param name="waitSendTaskSubmitCaseInfoRepository"></param>
-        /// <param name="sendTaskSubmitCaseInfoRepository"></param>
-        /// <param name="waitSendTaskSubmitCaseProcessRepository"></param>
-        /// <param name="sendTaskSubmitCaseProcessRepository"></param>
-        /// <param name="waitSendTaskSubmitCaseRecordRepository"></param>
-        /// <param name="sendTaskSubmitCaseRecordRepository"></param>
-        /// <param name="waitSendTaskSubmitCaseResultRepository"></param>
-        /// <param name="sendTaskSubmitCaseResultRepository"></param>
-        /// <param name="waitSendTaskRepository"></param>
-        /// <param name="sendTaskDetailInfoRepository"></param>
-        /// <param name="waitSendTaskOtherPlatformsRepository"></param>
-        /// <param name="sendTaskOtherPlatformsRepository"></param>
-        /// <param name="initPushDataService"></param>
-        /// <param name="taskRepository"></param>
-        /// <param name="taskInfoRepository"></param>
-        /// <param name="dsOrderRepository"></param>
-        /// <param name="sendHotlineErrorDataRepository"></param>
-        /// <param name="fwClient"></param>
-        /// <param name="sharingConfigurationManager"></param>
-        /// <param name="userOperationLogRepository"></param>
-        /// <param name="sendFwErrorDataRepository"></param>
-        /// <param name="getCaseMaterialInfoRepository"></param>
         public HotlineWebController(IMapper mapper,
             IMediator mediator,
             ICapPublisher capPublisher,
@@ -182,7 +155,12 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
            ISharingConfigurationManager sharingConfigurationManager,
            IRepository<UserOperationLog> userOperationLogRepository,
            IRepository<SendFwErrorData> sendFwErrorDataRepository,
-           IRepository<DsGetCaseMaterialInfo> getCaseMaterialInfoRepository)
+           IRepository<DsGetCaseMaterialInfo> getCaseMaterialInfoRepository,
+           IRepository<DsReceiveDataExchangeData> dsReceiveDataExchangeDataRepository,
+           IRepository<DsReceiveEnterpriseData> dsReceiveEnterpriseDataRepository,
+           IRepository<DsReceiveMediaData> dsReceiveMediaDataRepository,
+           IRepository<DsReceivePoliceData> dsReceivePoliceDataRepository
+           )
         {
             _mapper = mapper;
             _mediator = mediator;
@@ -218,6 +196,10 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             _userOperationLogRepository = userOperationLogRepository;
             _sendFwErrorDataRepository = sendFwErrorDataRepository;
             _getCaseMaterialInfoRepository = getCaseMaterialInfoRepository;
+            _dsReceiveDataExchangeDataRepository = dsReceiveDataExchangeDataRepository;
+            _dsReceiveEnterpriseDataRepository = dsReceiveEnterpriseDataRepository;
+            _dsReceiveMediaDataRepository = dsReceiveMediaDataRepository;
+            _dsReceivePoliceDataRepository = dsReceivePoliceDataRepository;
         }
         #endregion
 
@@ -739,7 +721,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             //连表查询数据
             RefAsync<int> total = 0;
             var items = await _waitSendTaskRepository.UnionAll(waitSendTaskProvinceOther, waitSendTaskSubmitCaseInfo, waitSendTaskSubmitCaseProcess,
-             waitSendTaskSubmitCaseRecord, waitSendTaskSubmitCaseResult)
+             waitSendTaskSubmitCaseRecord, waitSendTaskSubmitCaseResult).MergeTable()
                 .OrderBy(p => p.CreationTime)
                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
 
@@ -1566,6 +1548,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
 
         #endregion
 
+        #region 省查询
         /// <summary>
         /// 查询附件信息
         /// </summary>
@@ -1624,5 +1607,87 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 }
             }
         }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpGet("get_receive_raw_data")]
+        [AllowAnonymous]
+        public async Task<PagedDto<ReceiveRawDataDto>> GetReceiveRawData([FromQuery] ReportPagedRequest dto)
+        {
+            //市州数据交换原始数据
+            var queryDataExchangeData = _dsReceiveDataExchangeDataRepository.Queryable()
+                  .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                  .WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.ExternalId.Contains(dto.Keyword))
+                  .Select(p => new ReceiveRawDataDto
+                  {
+                      OrderNo = p.ExternalId,
+                      RawData = p.ReceiveData,
+                      PlatformsName = p.PlatformsName,
+                      ServiceInterface = p.ServiceInterface,
+                      CreationTime = p.CreationTime
+                  })
+                  .MergeTable();
+
+            //企业专班原始数据
+            var queryEnterpriseData = _dsReceiveEnterpriseDataRepository.Queryable()
+                       .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                       .WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.ExternalId.Contains(dto.Keyword))
+                        .Select(p => new ReceiveRawDataDto
+                        {
+                            OrderNo = p.ExternalId,
+                            RawData = p.ReceiveData,
+                            PlatformsName = "企业专班",
+                            ServiceInterface = p.ServiceInterface,
+                            CreationTime = p.CreationTime
+                        })
+                        .MergeTable();
+
+            //融媒体等原始数据
+            var queryMediaData = _dsReceiveMediaDataRepository.Queryable()
+                   .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                    .WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.OrderCode.Contains(dto.Keyword))
+                     .Select(p => new ReceiveRawDataDto
+                     {
+                         OrderNo = p.OrderCode,
+                         RawData = p.ReceiveData,
+                         PlatformsName = p.PlatformsName,
+                         ServiceInterface = p.ServiceInterface,
+                         CreationTime = p.CreationTime
+                     })
+                       .MergeTable();
+
+            //110平台
+            var queryPoliceData = _dsReceivePoliceDataRepository.Queryable()
+                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                 .WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.ExternalId.Contains(dto.Keyword))
+                 .Select(p => new ReceiveRawDataDto
+                 {
+                     OrderNo = p.ExternalId,
+                     RawData = p.ReceiveData,
+                     PlatformsName = "110平台",
+                     ServiceInterface = p.ServiceInterface,
+                     CreationTime = p.CreationTime
+                 })
+                 .MergeTable();
+
+            //连表查询数据
+            RefAsync<int> total = 0;
+            var items = await _waitSendTaskRepository.UnionAll(queryDataExchangeData, queryEnterpriseData, queryMediaData, queryPoliceData).MergeTable()
+                .OrderBy(p => p.CreationTime)
+                .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
+            if (items != null)
+            {
+                foreach (var item in items)
+                {
+                    item.RawData = System.Text.RegularExpressions.Regex.Unescape(item.RawData);
+                }
+            }
+
+            return new PagedDto<ReceiveRawDataDto>(total, items);
+        }
     }
 }

src/DataSharing.Host/Controllers/YiBin/ConvergenceMediaController.cs

@@ -106,7 +106,7 @@ namespace DataSharing.Host.Controllers.YiBin
             DsReceiveMediaData dsReceiveMediaData = new()
             {
                 ServiceInterface = "WriteOrder",
-                PlatformsName = accountDto.PlatformSource,
+                PlatformsName = accountDto.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(mediaDataReceiveDto)
             };
             dsReceiveMediaData.Id = await _dsReceiveMediaDataRepository.AddAsync(dsReceiveMediaData, HttpContext.RequestAborted);

src/DataSharing.Host/Controllers/YiBin/WllzYBController.cs

@@ -72,11 +72,7 @@ namespace DataSharing.Host.Controllers.YiBin
                 new() { Name = "求助", Value = "20" },
                 new() { Name = "表扬", Value = "25" },
                 new() { Name = "举报", Value = "30" },
-                new() { Name = "投诉", Value = "35" },
-                new() { Name = "其他", Value = "40" },
-                new() { Name = "意见", Value = "1" },
-                new() { Name = "惠民帮助", Value = "2" },
-                new() { Name = "大气污染举报", Value = "3" }
+                new() { Name = "投诉", Value = "35" }
             };
 
             return OpenResponse.Ok(OtherPlatformsDeResponse<List<AcceptTypeListDto>>.Success(acceptTypeListDtos));
@@ -104,7 +100,7 @@ namespace DataSharing.Host.Controllers.YiBin
             DsReceiveMediaData dsReceiveMediaData = new()
             {
                 ServiceInterface = "e_WriteInfo",
-                PlatformsName = accountDto.PlatformSource,
+                PlatformsName = accountDto.PlatformSourceName,
                 // ExternalId = dto.strZZCode,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
             };
@@ -174,7 +170,7 @@ namespace DataSharing.Host.Controllers.YiBin
             DsReceiveMediaData dsReceiveMediaData = new()
             {
                 ServiceInterface = "e_WriteResult",
-                PlatformsName = accountDto.PlatformSource,
+                PlatformsName = accountDto.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto),
                 OrderCode = dto.strCodes,
             };

src/DataSharing.Host/Controllers/YiBin/ZhYBController.cs

@@ -76,11 +76,7 @@ namespace DataSharing.Host.Controllers.YiBin
                 new() { Name = "求助", Value = "20" },
                 new() { Name = "表扬", Value = "25" },
                 new() { Name = "举报", Value = "30" },
-                new() { Name = "投诉", Value = "35" },
-                new() { Name = "其他", Value = "40" },
-                new() { Name = "意见", Value = "1" },
-                new() { Name = "惠民帮助", Value = "2" },
-                new() { Name = "大气污染举报", Value = "3" }
+                new() { Name = "投诉", Value = "35" }
             };
 
             return OpenResponse.Ok(OtherPlatformsDeResponse<List<AcceptTypeListDto>>.Success(acceptTypeListDtos));
@@ -108,7 +104,7 @@ namespace DataSharing.Host.Controllers.YiBin
             DsReceiveMediaData dsReceiveMediaData = new()
             {
                 ServiceInterface = "e_WriteInfo",
-                PlatformsName = accountDto.PlatformSource,
+                PlatformsName = accountDto.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
             };
             dsReceiveMediaData.Id = await _dsReceiveMediaDataRepository.AddAsync(dsReceiveMediaData, HttpContext.RequestAborted);

src/DataSharing.Host/Controllers/YiBin/ZzptYBController.cs

@@ -67,16 +67,12 @@ namespace DataSharing.Host.Controllers.YiBin
                 return OpenResponse.Ok(OtherPlatformsDeResponse<string>.Failed("密钥错误", "-900"));
             List<AcceptTypeListDto> acceptTypeListDtos = new()
             {
-                new() { Name = "咨询", Value = "10" },
+               new() { Name = "咨询", Value = "10" },
                 new() { Name = "建议", Value = "15" },
                 new() { Name = "求助", Value = "20" },
                 new() { Name = "表扬", Value = "25" },
                 new() { Name = "举报", Value = "30" },
-                new() { Name = "投诉", Value = "35" },
-                new() { Name = "其他", Value = "40" },
-                new() { Name = "意见", Value = "1" },
-                new() { Name = "惠民帮助", Value = "2" },
-                new() { Name = "大气污染举报", Value = "3" }
+                new() { Name = "投诉", Value = "35" }
             };
 
             return OpenResponse.Ok(OtherPlatformsDeResponse<List<AcceptTypeListDto>>.Success(acceptTypeListDtos));
@@ -104,7 +100,7 @@ namespace DataSharing.Host.Controllers.YiBin
             DsReceiveMediaData dsReceiveMediaData = new()
             {
                 ServiceInterface = "e_WriteInfo",
-                PlatformsName = accountDto.PlatformSource,
+                PlatformsName = accountDto.PlatformSourceName,
                 ExternalId = dto.strZZCode,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
             };
@@ -180,7 +176,7 @@ namespace DataSharing.Host.Controllers.YiBin
             DsReceiveMediaData dsReceiveMediaData = new()
             {
                 ServiceInterface = "e_WriteResult",
-                PlatformsName = accountDto.PlatformSource,
+                PlatformsName = accountDto.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto),
                 OrderCode = dto.strCode,
             };
@@ -191,7 +187,7 @@ namespace DataSharing.Host.Controllers.YiBin
                 return OpenResponse.Ok(OtherPlatformsDeResponse<string>.Failed("该工单不属于12345", "0"));
 
             var count = await _dsReceiveMediaDataRepository.Queryable()
-                .Where(p => p.ServiceInterface == "e_WriteResult" && p.PlatformsName == accountDto.PlatformSource && p.OrderCode == dto.strCode)
+                .Where(p => p.ServiceInterface == "e_WriteResult" && p.PlatformsName == accountDto.PlatformSourceName && p.OrderCode == dto.strCode)
                 .CountAsync();
             if (count <= 1)
             {

src/DataSharing.Repository/WaitSendTaskRepository.cs

@@ -14,39 +14,44 @@ namespace DataSharing.Repository
 
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="t1"></param>
-        /// <param name="t2"></param>
-        /// <param name="t3"></param>
-        /// <param name="t4"></param>
-        /// <returns></returns>
-        public ISugarQueryable<DsWaitSendTaskDto> UnionAll(ISugarQueryable<DsWaitSendTaskDto> t1,
-            ISugarQueryable<DsWaitSendTaskDto> t2,
-            ISugarQueryable<DsWaitSendTaskDto> t3,
-            ISugarQueryable<DsWaitSendTaskDto> t4,
-            ISugarQueryable<DsWaitSendTaskDto> t5)
+        public ISugarQueryable<T> UnionAll<T>(params ISugarQueryable<T>[] queryables) where T : class
         {
-            return Db.UnionAll(t1, t2, t3, t4, t5)
-                  .Select(p => new DsWaitSendTaskDto
-                  {
-                      Id = p.Id,
-                      ProvinceNo = p.ProvinceNo,
-                      FirstTime = p.FirstTime,
-                      LastTime = p.LastTime,
-                      SendTimes = p.SendTimes,
-                      PlatformSource = EPlatformSource.Province,
-                      TaskType = p.TaskType,
-                      HttpMethod = p.HttpMethod,
-                      Path = p.Path,
-                      Request = p.Request,
-                      PathType = p.PathType,
-                      GenerationTime = p.GenerationTime,
-                      CreationTime=p.CreationTime,
-                      State = p.State
-                  })
-                .MergeTable();
+            return Db.UnionAll(queryables);
         }
+
+        ///// <summary>
+        ///// 
+        ///// </summary>
+        ///// <param name="t1"></param>
+        ///// <param name="t2"></param>
+        ///// <param name="t3"></param>
+        ///// <param name="t4"></param>
+        ///// <returns></returns>
+        //public ISugarQueryable<DsWaitSendTaskDto> UnionAll(ISugarQueryable<DsWaitSendTaskDto> t1,
+        //    ISugarQueryable<DsWaitSendTaskDto> t2,
+        //    ISugarQueryable<DsWaitSendTaskDto> t3,
+        //    ISugarQueryable<DsWaitSendTaskDto> t4,
+        //    ISugarQueryable<DsWaitSendTaskDto> t5)
+        //{
+        //    return Db.UnionAll(t1, t2, t3, t4, t5)
+        //          .Select(p => new DsWaitSendTaskDto
+        //          {
+        //              Id = p.Id,
+        //              ProvinceNo = p.ProvinceNo,
+        //              FirstTime = p.FirstTime,
+        //              LastTime = p.LastTime,
+        //              SendTimes = p.SendTimes,
+        //              PlatformSource = EPlatformSource.Province,
+        //              TaskType = p.TaskType,
+        //              HttpMethod = p.HttpMethod,
+        //              Path = p.Path,
+        //              Request = p.Request,
+        //              PathType = p.PathType,
+        //              GenerationTime = p.GenerationTime,
+        //              CreationTime=p.CreationTime,
+        //              State = p.State
+        //          })
+        //        .MergeTable();
+        //}
     }
 }

src/DataSharing.Share/Dtos/Common/CheckAccountDto.cs

@@ -15,8 +15,13 @@ namespace DataSharing.Share.Dtos.Common
         public string Message { get; set; }
 
         /// <summary>
-        /// 所属平台名称
+        /// 所属平台
         /// </summary>
         public string PlatformSource { get; set; }
+
+        /// <summary>
+        /// 所属平台名称
+        /// </summary>
+        public string? PlatformSourceName { get; set; }
     }
 }

src/DataSharing.Share/Dtos/HotlineWeb/ReceiveRawDataDto.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataSharing.Share.Dtos.HotlineWeb
+{
+    /// <summary>
+    /// 接收到的原始数据
+    /// </summary>
+    public class ReceiveRawDataDto
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public string? OrderNo {  get; set; }
+        
+        /// <summary>
+        /// 原始数据
+        /// </summary>
+        public string? RawData {  get; set; }
+
+        /// <summary>
+        /// 平台名称
+        /// </summary>
+        public string? PlatformsName { get; set; }
+
+        /// <summary>
+        /// 服务接口名称
+        /// </summary>
+        public string? ServiceInterface { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreationTime { get; set; }
+    }
+}

src/DataSharing/CityStateDataExchange/DsReceiveDataExchangeData.cs

@@ -28,5 +28,11 @@ namespace DataSharing.CityStateDataExchange
         [SugarColumn(ColumnDescription = "推送数据", ColumnDataType = "text")]
         public string? ReceiveData { get; set; }
 
+        /// <summary>
+        /// 平台名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "平台名称", ColumnDataType = "varchar(50)")]
+        public string? PlatformsName { get; set; }
+
     }
 }

src/DataSharing/Province/SendTask/IWaitSendTaskRepository.cs

@@ -7,18 +7,20 @@ namespace DataSharing.Province.SendTask
 {
     public interface IWaitSendTaskRepository : IRepository<DsWaitSendTaskProvinceOther>
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="t1"></param>
-        /// <param name="t2"></param>
-        /// <param name="t3"></param>
-        /// <param name="t4"></param>
-        /// <returns></returns>
-        ISugarQueryable<DsWaitSendTaskDto> UnionAll(ISugarQueryable<DsWaitSendTaskDto> t1,
-           ISugarQueryable<DsWaitSendTaskDto> t2,
-           ISugarQueryable<DsWaitSendTaskDto> t3,
-           ISugarQueryable<DsWaitSendTaskDto> t4,
-           ISugarQueryable<DsWaitSendTaskDto> t5);
+        ISugarQueryable<T> UnionAll<T>(params ISugarQueryable<T>[] queryables) where T : class;
+
+        ///// <summary>
+        ///// 
+        ///// </summary>
+        ///// <param name="t1"></param>
+        ///// <param name="t2"></param>
+        ///// <param name="t3"></param>
+        ///// <param name="t4"></param>
+        ///// <returns></returns>
+        //ISugarQueryable<DsWaitSendTaskDto> UnionAll(ISugarQueryable<DsWaitSendTaskDto> t1,
+        //   ISugarQueryable<DsWaitSendTaskDto> t2,
+        //   ISugarQueryable<DsWaitSendTaskDto> t3,
+        //   ISugarQueryable<DsWaitSendTaskDto> t4,
+        //   ISugarQueryable<DsWaitSendTaskDto> t5);
     }
 }

src/DataSharing/RawData/DsUserTokenInfoService.cs

@@ -40,6 +40,7 @@ namespace DataSharing.RawData
             {
                 accountDto.PlatformSource = data.PlatformSource;
                 accountDto.IsCheckAccount = true;
+                accountDto.PlatformSourceName=data.PlatformSourceName;
                 return accountDto;
             }