src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -29,6 +29,7 @@ using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Utilities;
 using SqlSugar;
 using StackExchange.Redis;
 using System.Security.Cryptography;
@@ -120,6 +121,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
         private readonly IRepository<DsReceiveEnterpriseData> _dsReceiveEnterpriseDataRepository;
         private readonly IRepository<DsReceiveMediaData> _dsReceiveMediaDataRepository;
         private readonly IRepository<DsReceivePoliceData> _dsReceivePoliceDataRepository;
+        private readonly IRepository<DsReceiveHandleData> _dsReceiveHandleDataRepository;
 
 
         public HotlineWebController(IMapper mapper,
@@ -159,7 +161,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
            IRepository<DsReceiveDataExchangeData> dsReceiveDataExchangeDataRepository,
            IRepository<DsReceiveEnterpriseData> dsReceiveEnterpriseDataRepository,
            IRepository<DsReceiveMediaData> dsReceiveMediaDataRepository,
-           IRepository<DsReceivePoliceData> dsReceivePoliceDataRepository
+           IRepository<DsReceivePoliceData> dsReceivePoliceDataRepository,
+           IRepository<DsReceiveHandleData> dsReceiveHandleDataRepository
            )
         {
             _mapper = mapper;
@@ -200,6 +203,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             _dsReceiveEnterpriseDataRepository = dsReceiveEnterpriseDataRepository;
             _dsReceiveMediaDataRepository = dsReceiveMediaDataRepository;
             _dsReceivePoliceDataRepository = dsReceivePoliceDataRepository;
+            _dsReceiveHandleDataRepository = dsReceiveHandleDataRepository;
         }
         #endregion
 
@@ -833,7 +837,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                        GenerationTime = p.GenerationTime,
                        CreationTime = p.CreationTime,
                        IsSuccess = p.IsSuccess,
-                       ExpiredTime= p.ExpiredTime
+                       ExpiredTime = p.ExpiredTime
                    })
                     .MergeTable()
                     .OrderByDescending(p => p.CreationTime)
@@ -926,8 +930,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                          GenerationTime = p.GenerationTime,
                          CreationTime = p.CreationTime,
                          IsSuccess = p.IsSuccess,
-                         FiledTime=p.FiledTime,
-                         ExpiredTime= SqlFunc.Subqueryable<DsSendTaskSubmitCaseInfo>().Where(s => s.ProvinceNo == p.ProvinceNo).OrderByDesc(s=>s.LastTime).Select(s => s.ExpiredTime)
+                         FiledTime = p.FiledTime,
+                         ExpiredTime = SqlFunc.Subqueryable<DsSendTaskSubmitCaseInfo>().Where(s => s.ProvinceNo == p.ProvinceNo).OrderByDesc(s => s.LastTime).Select(s => s.ExpiredTime)
                      })
                     .OrderByDescending(p => p.CreationTime)
                     .MergeTable().ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
@@ -1619,78 +1623,21 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
         /// <returns></returns>
         [HttpGet("get_receive_raw_data")]
         [AllowAnonymous]
-        public async Task<PagedDto<ReceiveRawDataDto>> GetReceiveRawData([FromQuery] ReportPagedRequest dto)
+        public async Task<PagedDto<DsReceiveHandleData>> 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);
+            var items = await _dsReceiveHandleDataRepository.Queryable()
+                    .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                    .WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.OrderNo.Contains(dto.Keyword))
+                    .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);
+                    item.ReceiveData = System.Text.RegularExpressions.Regex.Unescape(item.ReceiveData);
                 }
             }
-
-            return new PagedDto<ReceiveRawDataDto>(total, items);
+            return new PagedDto<DsReceiveHandleData>(total, items);
         }
     }
 }

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

@@ -1,39 +0,0 @@
-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; }
-    }
-}