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 } } + /// + /// 获取机场sn获取无人机列表 + /// + /// + /// + /// + /// + public async Task>>> GetUavPageByDockSnNew(int page, int limit, string sn) + { + RefAsync totalCount = 0; + using (var db = UnitWork.CreateContext()) + { + var dockinfo = await db.LasaDronePort.GetFirstAsync(r => r.Sn == sn); + + var list = await db.LasaUav.AsQueryable() + .LeftJoin((a, b) => a.PId == b.Id) + .Where((a, b) => a.IsDelete == false) + .WhereIF(dockinfo != null, (a, b) => a.PId == dockinfo.Id) + .Select((a, b) => new + { + id = a.Id, + sn = a.Sn, + }) + .ToPageListAsync(page, limit, totalCount); + return new Response>> + { + Result = new PageInfo> { Items = list, Total = totalCount } + }; + } + } + + /// /// 获取机场sn获取无人机列表 /// 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>>(); try { - result = await _app.GetUavPageByDocksn(page, limit, sn); + result = await _app.GetUavPageByDockSnNew(page, limit, sn); } catch (Exception ex) {