opt:定时任务刷新轨迹分页
This commit is contained in:
parent
aecb488045
commit
2c5aa4f35a
@ -88,32 +88,36 @@ public class TrackPullService : ApplicationService
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId);
|
var page = 1;
|
||||||
var serviceProviderCode = orders.FirstOrDefault()?.ServiceProviderCode;
|
var orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId, page);
|
||||||
var serviceProviderName = orders.FirstOrDefault()?.ServiceProviderName;
|
while (orders.Any())
|
||||||
|
|
||||||
foreach (var group in orders.GroupBy(x =>
|
|
||||||
new { x.SubSystemId, x.OrderType }))
|
|
||||||
{
|
{
|
||||||
var data = group.Select(x => new
|
var serviceProviderCode = orders.FirstOrDefault()?.ServiceProviderCode;
|
||||||
{
|
var serviceProviderName = orders.FirstOrDefault()?.ServiceProviderName;
|
||||||
x.OrderNo
|
|
||||||
}).ToList();
|
|
||||||
|
|
||||||
var attach = Base64Helper.SerializeObject(new TrackRefreshAttach(config.ServiceProviderId,
|
foreach (var group in orders.GroupBy(x =>
|
||||||
serviceProviderName!,
|
new { x.SubSystemId, x.OrderType }))
|
||||||
group.Key.SubSystemId, group.Key.OrderType));
|
{
|
||||||
// 批量获取轨迹
|
var data = group.Select(x => new
|
||||||
await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync(
|
{
|
||||||
InterfaceRelayConst.GetTrackInterfaceCode, serviceProviderCode, data,
|
x.OrderNo
|
||||||
GlobalConst.TrackRefreshSubscribe, attach);
|
}).ToList();
|
||||||
|
|
||||||
|
var attach = Base64Helper.SerializeObject(new TrackRefreshAttach(config.ServiceProviderId,
|
||||||
|
serviceProviderName!,
|
||||||
|
group.Key.SubSystemId, group.Key.OrderType));
|
||||||
|
// 批量获取轨迹
|
||||||
|
await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync(
|
||||||
|
InterfaceRelayConst.GetTrackInterfaceCode, serviceProviderCode, data,
|
||||||
|
GlobalConst.TrackRefreshSubscribe, attach);
|
||||||
|
}
|
||||||
|
|
||||||
|
orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId, ++page);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config.PullInterval < 60) config.PullInterval = 60;
|
|
||||||
await RedisHelper.Client.SetExAsync(redisKey, config.PullInterval * 60, orders.Count);
|
await RedisHelper.Client.SetExAsync(redisKey, config.PullInterval * 60, orders.Count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -60,6 +60,9 @@ public interface IProvideQueries
|
|||||||
/// 获取服务商下所有单(未完成的)
|
/// 获取服务商下所有单(未完成的)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="serviceProvider"></param>
|
/// <param name="serviceProvider"></param>
|
||||||
|
/// <param name="pageIndex"></param>
|
||||||
|
/// <param name="pageSize"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<List<OrderWithServiceProviderVO>> FindOrderWithServiceProviderAsync(int serviceProvider);
|
Task<List<OrderWithServiceProviderVO>> FindOrderWithServiceProviderAsync(int serviceProvider, int pageIndex,
|
||||||
|
int pageSize = 1000);
|
||||||
}
|
}
|
||||||
@ -113,7 +113,8 @@ public class ProvideQueries : ISugarRepository, IProvideQueries,
|
|||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<OrderWithServiceProviderVO>> FindOrderWithServiceProviderAsync(int serviceProvider)
|
public async Task<List<OrderWithServiceProviderVO>> FindOrderWithServiceProviderAsync(int serviceProvider,
|
||||||
|
int pageIndex, int pageSize = 1000)
|
||||||
{
|
{
|
||||||
return await Context.Queryable<OrderEntity>()
|
return await Context.Queryable<OrderEntity>()
|
||||||
.RightJoin<OrderTemplateEntity>((a, b) => a.Id == b.OrderId)
|
.RightJoin<OrderTemplateEntity>((a, b) => a.Id == b.OrderId)
|
||||||
@ -128,6 +129,8 @@ public class ProvideQueries : ISugarRepository, IProvideQueries,
|
|||||||
ServiceProviderName = c.Name,
|
ServiceProviderName = c.Name,
|
||||||
SubSystemId = a.SubSystemId
|
SubSystemId = a.SubSystemId
|
||||||
})
|
})
|
||||||
|
.Skip((pageIndex - 1) * pageSize)
|
||||||
|
.Take(pageSize)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user