diff --git a/OpenAuth.App/ServiceApp/ManageApp.cs b/OpenAuth.App/ServiceApp/ManageApp.cs index 4e83d78..e5d027b 100644 --- a/OpenAuth.App/ServiceApp/ManageApp.cs +++ b/OpenAuth.App/ServiceApp/ManageApp.cs @@ -1,16 +1,18 @@ using System.Drawing; -using DocumentFormat.OpenXml.Office2010.Excel; -using DocumentFormat.OpenXml.Wordprocessing; +using System.Dynamic; +using System.Text; using Infrastructure; using Infrastructure.CloudSdk.minio; using Infrastructure.CloudSdk.wayline; using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Configuration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using OpenAuth.App.BaseApp.Base; using OpenAuth.App.BasicQueryService; using OpenAuth.App.Interface; +using OpenAuth.App.Request; +using OpenAuth.App.ServiceApp.AirLine.Request; +using OpenAuth.App.ServiceApp.FlyTask.Response; using OpenAuth.App.ServiceApp.Request; using OpenAuth.App.ServiceApp.Response; using OpenAuth.Repository; @@ -18,14 +20,6 @@ using OpenAuth.Repository.Domain; using OpenAuth.WebApi; using OpenAuth.WebApi.CloudSdk; using SqlSugar; -using System.Dynamic; -using System.Text; -using Hopetry.App.Common; -using NPOI.HSSF.Record; -using OpenAuth.App.Request; -using OpenAuth.App.ServiceApp.AirLine.Request; -using OpenAuth.App.ServiceApp.FlyTask.Response; -using Image = NetModular.DocX.Core.Image; namespace OpenAuth.App.ServiceApp { @@ -1568,7 +1562,7 @@ namespace OpenAuth.App.ServiceApp imgWidth = dimensions.width, imgOriginHeight = dimensions.height, imgOriginWidth = dimensions.width, - psjj = 0, // 等效焦距 + psjj = 24, // 等效焦距 todo 等效焦距如何取 time = lasaMediaFile.CreateTime, height = lasaMediaFile.Height, lon = lasaMediaFile.Lng, diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs index a2e36e4..1caf239 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs @@ -155,6 +155,31 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers return await _app.DeleteUav(id); } + /// + /// 无人机查询 + /// + /// + /// + /// + /// + [HttpGet] + [AllowAnonymous] + public async Task>>> GetUavPageByDockSnNew(int page, int limit, string sn) + { + var result = new Response>>(); + try + { + result = await _app.GetUavPageByDocksn(page, limit, sn); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.Message; + } + + return result; + } + /// /// 根据机场sn获取无人机列表 ///