From d9e4865e4701f9ab2d791648c71f1afa80eab287 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:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=9C=BA?=
 =?UTF-8?q?=E5=9C=BA=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=97=A0=E4=BA=BA?=
 =?UTF-8?q?=E6=9C=BA=E4=BF=A1=E6=81=AF=E6=97=A0=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/ManageApp.cs          | 18 +++++--------
 .../ServiceControllers/ManageController.cs    | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 12 deletions(-)

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);
         }
 
+        /// <summary>
+        /// 无人机查询
+        /// </summary>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <param name="sn"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageByDockSnNew(int page, int limit, string sn)
+        {
+            var result = new Response<PageInfo<List<dynamic>>>();
+            try
+            {
+                result = await _app.GetUavPageByDocksn(page, limit, sn);
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.Message;
+            }
+
+            return result;
+        }
+        
         /// <summary>
         /// 根据机场sn获取无人机列表
         /// </summary>