|
@@ -4,6 +4,7 @@ using DataSharing.SendTask;
|
|
|
using DataSharing.Share.Enums;
|
|
|
using Microsoft.Extensions.Logging;
|
|
|
using Quartz;
|
|
|
+using System.Threading.Tasks;
|
|
|
using XF.Domain.Repository;
|
|
|
|
|
|
namespace DataSharing.Province.SendTask
|
|
@@ -36,12 +37,16 @@ namespace DataSharing.Province.SendTask
|
|
|
{
|
|
|
if (_channelConfigurationManager.GetConfigurationIsOpenPush())
|
|
|
{
|
|
|
+ Random random = new Random();
|
|
|
+ int randomNumber = random.Next(0, 2); // 生成0到99之间的整数
|
|
|
//读取数据
|
|
|
var dataSendList = await _dsSendCallRepository.Queryable()
|
|
|
.Where(d => d.State == EWaitSendTaskState.WaitPush && d.SendTimes <= 6)
|
|
|
+ .OrderByIF(randomNumber == 0, d => d.Id, SqlSugar.OrderByType.Asc)
|
|
|
+ .OrderByIF(randomNumber == 1, d => d.Id, SqlSugar.OrderByType.Desc)
|
|
|
.Take(30)
|
|
|
.ToListAsync(context.CancellationToken);
|
|
|
-
|
|
|
+ _logger.LogWarning("再次推送读取条数--------------------------------------" + dataSendList.Count);
|
|
|
//数据不为空
|
|
|
if (dataSendList != null && dataSendList.Any())
|
|
|
{
|
|
@@ -58,6 +63,7 @@ namespace DataSharing.Province.SendTask
|
|
|
}
|
|
|
if (sendList != null && sendList.Any())
|
|
|
{
|
|
|
+ _logger.LogWarning("再次推送添加条数--------------------------------------" + sendList.Count);
|
|
|
//添加待推送表数据
|
|
|
foreach (var item in sendList)
|
|
|
{
|