From e27afea768ef6f245fddaf8c33ca71deadb118ea Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Mon, 23 Jun 2025 17:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=BA=E5=9C=BAsn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/ManageApp.cs          | 24 +++++++++++++++----
 .../ServiceControllers/ManageController.cs    |  4 ++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/OpenAuth.App/ServiceApp/ManageApp.cs b/OpenAuth.App/ServiceApp/ManageApp.cs
index 608ab46..1d08240 100644
--- a/OpenAuth.App/ServiceApp/ManageApp.cs
+++ b/OpenAuth.App/ServiceApp/ManageApp.cs
@@ -119,17 +119,33 @@ namespace OpenAuth.App.ServiceApp
         /// <param name="limit"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-        public async Task<Response<PageInfo<List<LasaUav>>>> GetUavPageList(int page, int limit, string key)
+        public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageList(int page, int limit, string key)
         {
             RefAsync<int> totalCount = 0;
             using (var db = UnitWork.CreateContext())
             {
                 var list = await db.LasaUav.AsQueryable()
-                    .WhereIF(!string.IsNullOrEmpty(key), a => a.Name.Contains(key))
+                    .LeftJoin<LasaDronePort>((a,b)=>a.PId==b.Id)
+                    .WhereIF(!string.IsNullOrEmpty(key), (a, b) => a.Name.Contains(key))
+                    .Select<dynamic>((a, b) => new 
+                    {
+                        Id = a.Id,
+                        Name = a.Name,
+                        PId = a.PId,
+                        TypeId = a.TypeId,
+                        Sn = a.Sn,
+                        Psn = b.Sn,
+                        UpdateTime = a.UpdateTime,
+                        IsDelete = a.IsDelete,
+                        PName = b.Name, // 机场名称
+                        WorkSpaceId=a.WorkSpaceId,
+                        FirmwareVersion=a.FirmwareVersion,
+
+                    })
                     .ToPageListAsync(page, limit, totalCount);
-                return new Response<PageInfo<List<LasaUav>>>
+                return new Response<PageInfo<List<dynamic>>>
                 {
-                    Result = new PageInfo<List<LasaUav>> { Items = list, Total = totalCount }
+                    Result = new PageInfo<List<dynamic>> { Items = list, Total = totalCount }
                 };
             }
         }
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
index 1a7d068..2e1da35 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
@@ -89,9 +89,9 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <returns></returns>
         [HttpGet]
         [AllowAnonymous]
-        public async Task<Response<PageInfo<List<LasaUav>>>> GetUavPageList(int page, int limit, string key)
+        public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageList(int page, int limit, string key)
         {
-            var result = new Response<PageInfo<List<LasaUav>>>();
+            var result = new Response<PageInfo<List<dynamic>>>();
             try
             {
                 result = await _app.GetUavPageList(page, limit, key);