返回数据结构精简

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>

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)
             {