ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/S03-轨迹中台优化项' into test

Browse Source
This commit is contained in:
dingenwen 2024-04-22 15:06:32 +08:00
commit b6ce2db553
7 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs
View File

@ -60,9 +60,9 @@
/// </summary> /// </summary>
public List<int>? SelectIds { get; set; } public List<int>? SelectIds { get; set; }
///// <summary> /// <summary>
///// 关键字 /// 关键字
///// </summary> /// </summary>
//public string Keywords { get; set; } public string? Keywords { get; set; }
} }
} }

10
src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs
View File

@ -88,7 +88,10 @@ public class TrackPullService : ApplicationService
continue; continue;
} }
var orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId); var page = 1;
var orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId, page);
while (orders.Any())
{
var serviceProviderCode = orders.FirstOrDefault()?.ServiceProviderCode; var serviceProviderCode = orders.FirstOrDefault()?.ServiceProviderCode;
var serviceProviderName = orders.FirstOrDefault()?.ServiceProviderName; var serviceProviderName = orders.FirstOrDefault()?.ServiceProviderName;
@ -109,10 +112,11 @@ public class TrackPullService : ApplicationService
GlobalConst.TrackRefreshSubscribe, attach); GlobalConst.TrackRefreshSubscribe, attach);
} }
if (config.PullInterval < 60) config.PullInterval = 60; orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId, ++page);
await RedisHelper.Client.SetExAsync(redisKey, config.PullInterval * 60, orders.Count);
} }
await RedisHelper.Client.SetExAsync(redisKey, config.PullInterval * 60, orders.Count);
}
return true; return true;
} }

2
src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
View File

@ -86,6 +86,8 @@ public class TrackPullService : ApplicationService
[HttpPost("Edit")] [HttpPost("Edit")]
public async Task<bool> EditAsync([FromBody] EditTrackPullConfigInput input) public async Task<bool> EditAsync([FromBody] EditTrackPullConfigInput input)
{ {
if (input.PullInterval < 60) input.PullInterval = 60;
if (input.Options != OptionTypeNoNull.删除) if (input.Options != OptionTypeNoNull.删除)
{ {
Expression<Func<TrackPullConfigEntity, bool>> isAnyExp = x => Expression<Func<TrackPullConfigEntity, bool>> isAnyExp = x =>

8
src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs
View File

@ -18,10 +18,10 @@ namespace SJZY.Track.Domain.Dtos.TrackFlags
/// </summary> /// </summary>
public List<int>? SelectIds { get; set; } public List<int>? SelectIds { get; set; }
///// <summary> /// <summary>
///// 关键字 /// 关键字
///// </summary> /// </summary>
//public string Keywords { get; set; } public string? Keywords { get; set; }
} }
public class GetTrackFlagListVO public class GetTrackFlagListVO

5
src/SJZY.Track.Domain/Queries/IProvideQueries.cs
View File

@ -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);
} }

5
src/SJZY.Track.Repository/Queries/ProvideQueries.cs
View File

@ -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();
} }
} }

3
src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs
View File

@ -46,8 +46,9 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
.LeftJoin<VUserEntity>((a, b, c) => a.CreateUserId == c.Id && c.IsDeleted == false) .LeftJoin<VUserEntity>((a, b, c) => a.CreateUserId == c.Id && c.IsDeleted == false)
.LeftJoin<VUserEntity>((a, b, c, d) => a.UpdateUserId == d.Id && d.IsDeleted == false) .LeftJoin<VUserEntity>((a, b, c, d) => a.UpdateUserId == d.Id && d.IsDeleted == false)
.WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId) .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId)
.WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b, c, d) => SqlFunc.Contains(a.Code, input.Keywords))
.OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => a.CreateTime, OrderByType.Desc) .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => a.CreateTime, OrderByType.Desc)
.OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc) .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => SqlFunc.IIF(input.SelectIds!.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
.Select((a, b, c, d) => new GetTrackFlagListVO .Select((a, b, c, d) => new GetTrackFlagListVO
{ {
Id = a.Id, Id = a.Id,