From 2c5aa4f35a750e3904e3ac20f9157f98a2b91503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Mon, 22 Apr 2024 15:05:01 +0800
Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=B7=E6=96=B0=E8=BD=A8=E8=BF=B9=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProvideServices/TrackPullService.cs       | 42 ++++++++++---------
 .../Queries/IProvideQueries.cs                |  5 ++-
 .../Queries/ProvideQueries.cs                 |  5 ++-
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs
index 7cf315b2..354af4e1 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs
@@ -88,32 +88,36 @@ public class TrackPullService : ApplicationService
                 continue;
             }
 
-            var orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId);
-            var serviceProviderCode = orders.FirstOrDefault()?.ServiceProviderCode;
-            var serviceProviderName = orders.FirstOrDefault()?.ServiceProviderName;
-
-            foreach (var group in orders.GroupBy(x =>
-                         new { x.SubSystemId, x.OrderType }))
+            var page = 1;
+            var orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId, page);
+            while (orders.Any())
             {
-                var data = group.Select(x => new
-                {
-                    x.OrderNo
-                }).ToList();
+                var serviceProviderCode = orders.FirstOrDefault()?.ServiceProviderCode;
+                var serviceProviderName = orders.FirstOrDefault()?.ServiceProviderName;
 
-                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);
+                foreach (var group in orders.GroupBy(x =>
+                             new { x.SubSystemId, x.OrderType }))
+                {
+                    var data = group.Select(x => new
+                    {
+                        x.OrderNo
+                    }).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);
         }
 
-
         return true;
     }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs
index 2795df48..7d043a9f 100644
--- a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs
+++ b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs
@@ -60,6 +60,9 @@ public interface IProvideQueries
     /// 获取服务商下所有单（未完成的）
     /// </summary>
     /// <param name="serviceProvider"></param>
+    /// <param name="pageIndex"></param>
+    /// <param name="pageSize"></param>
     /// <returns></returns>
-    Task<List<OrderWithServiceProviderVO>> FindOrderWithServiceProviderAsync(int serviceProvider);
+    Task<List<OrderWithServiceProviderVO>> FindOrderWithServiceProviderAsync(int serviceProvider, int pageIndex,
+        int pageSize = 1000);
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs
index 7f144688..82e4993f 100644
--- a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs
+++ b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs
@@ -113,7 +113,8 @@ public class ProvideQueries : ISugarRepository, IProvideQueries,
             .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>()
             .RightJoin<OrderTemplateEntity>((a, b) => a.Id == b.OrderId)
@@ -128,6 +129,8 @@ public class ProvideQueries : ISugarRepository, IProvideQueries,
                 ServiceProviderName = c.Name,
                 SubSystemId = a.SubSystemId
             })
+            .Skip((pageIndex - 1) * pageSize)
+            .Take(pageSize)
             .ToListAsync();
     }
 }
\ No newline at end of file