From 9a2ee3f9e9fe3de0697f6613d50a30005156bed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com>
Date: Tue, 22 Jul 2025 14:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E7=B2=BE=E7=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/ManageApp.cs          | 32 +++++++++++++++++++
 .../ServiceControllers/ManageController.cs    |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/OpenAuth.App/ServiceApp/ManageApp.cs b/OpenAuth.App/ServiceApp/ManageApp.cs
index e5d027b..4997b08 100644
--- a/OpenAuth.App/ServiceApp/ManageApp.cs
+++ b/OpenAuth.App/ServiceApp/ManageApp.cs
@@ -207,6 +207,38 @@ namespace OpenAuth.App.ServiceApp
             }
         }
 
+        /// <summary>
+        /// 获取机场sn获取无人机列表
+        /// </summary>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageByDockSnNew(int page, int limit, string sn)
+        {
+            RefAsync<int> totalCount = 0;
+            using (var db = UnitWork.CreateContext())
+            {
+                var dockinfo = await db.LasaDronePort.GetFirstAsync(r => r.Sn == sn);
+
+                var list = await db.LasaUav.AsQueryable()
+                    .LeftJoin<LasaDronePort>((a, b) => a.PId == b.Id)
+                    .Where((a, b) => a.IsDelete == false)
+                    .WhereIF(dockinfo != null, (a, b) => a.PId == dockinfo.Id)
+                    .Select<dynamic>((a, b) => new
+                    {
+                        id = a.Id,
+                        sn = a.Sn,
+                    })
+                    .ToPageListAsync(page, limit, totalCount);
+                return new Response<PageInfo<List<dynamic>>>
+                {
+                    Result = new PageInfo<List<dynamic>> { Items = list, Total = totalCount }
+                };
+            }
+        }
+
+        
         /// <summary>
         /// 获取机场sn获取无人机列表
         /// </summary>
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
index 1caf239..da3932e 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
@@ -169,7 +169,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             var result = new Response<PageInfo<List<dynamic>>>();
             try
             {
-                result = await _app.GetUavPageByDocksn(page, limit, sn);
+                result = await _app.GetUavPageByDockSnNew(page, limit, sn);
             }
             catch (Exception ex)
             {