From fb777b78202f6034cb348881489d5857b79bde53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com>
Date: Mon, 21 Jul 2025 14:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=BD=95=E5=83=8F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FlyTask/Response/CommandVideoResponse.cs  | 17 ++++++++
 OpenAuth.App/ServiceApp/ManageApp.cs          | 40 +++++++++++++++++++
 .../ServiceControllers/ManageController.cs    |  8 ++++
 3 files changed, 65 insertions(+)
 create mode 100644 OpenAuth.App/ServiceApp/FlyTask/Response/CommandVideoResponse.cs

diff --git a/OpenAuth.App/ServiceApp/FlyTask/Response/CommandVideoResponse.cs b/OpenAuth.App/ServiceApp/FlyTask/Response/CommandVideoResponse.cs
new file mode 100644
index 0000000..b57cebc
--- /dev/null
+++ b/OpenAuth.App/ServiceApp/FlyTask/Response/CommandVideoResponse.cs
@@ -0,0 +1,17 @@
+namespace OpenAuth.App.ServiceApp.FlyTask.Response;
+
+public class CommandVideoResponse
+{
+    public bool issuccess { get; set; }
+    public byte[] imgBlob { get; set; }
+    public VideoExtData spkzxx { get; set; }
+    public string videoLink { get; set; }
+}
+
+public class VideoExtData
+{
+    public float? lon { get; set; }
+    public float? lat { get; set; }
+    public float? angle { get; set; }
+    public float? height { get; set; }
+}
\ No newline at end of file
diff --git a/OpenAuth.App/ServiceApp/ManageApp.cs b/OpenAuth.App/ServiceApp/ManageApp.cs
index b5b414b..9cfe740 100644
--- a/OpenAuth.App/ServiceApp/ManageApp.cs
+++ b/OpenAuth.App/ServiceApp/ManageApp.cs
@@ -1529,6 +1529,7 @@ namespace OpenAuth.App.ServiceApp
                 .AsQueryable()
                 .Where(r => r.FlightId == flightId)
                 .Where(r => r.ObjectKey.Contains("/Remote-Control"))
+                .Where(r=>r.ObjectKey.Contains(".jpeg"))
                 .Where(r => r.CreateTime > DateTimeOffset.FromUnixTimeMilliseconds(timestamp))
                 .SingleAsync();
             if (lasaMediaFile == null)
@@ -1575,6 +1576,45 @@ namespace OpenAuth.App.ServiceApp
                 }
             };
         }
+
+
+        public async Task<Response<CommandVideoResponse>> GetTaskVideoList(string flightId, long timestamp)
+        {
+            var lasaMediaFile = await Repository.ChangeRepository<SugarRepositiry<LasaMediaFile>>()
+                .AsQueryable()
+                .Where(r => r.FlightId == flightId)
+                .Where(r => r.ObjectKey.Contains("/Remote-Control"))
+                .Where(r=>r.ObjectKey.Contains("S.mp4"))
+                .Where(r => r.CreateTime > DateTimeOffset.FromUnixTimeMilliseconds(timestamp))
+                .SingleAsync();
+            if (lasaMediaFile == null)
+            {
+                return new Response<CommandVideoResponse>()
+                {
+                    Result = new CommandVideoResponse()
+                };
+            }
+            return new Response<CommandVideoResponse>()
+            {
+                Result = new CommandVideoResponse()
+                {
+                    videoLink = "http://" + _minioService.endPoint + "/" + _minioService._bucketName + "/" +
+                                lasaMediaFile.ObjectKey,
+                    spkzxx = new VideoExtData()
+                    {
+                        lon = lasaMediaFile.Lng,
+                        lat = lasaMediaFile.Lat,
+                        angle = lasaMediaFile.GimbalYawDegree,
+                        height = lasaMediaFile.RelativeAltitude
+                    }
+                }
+            };
+        }
+        /// <summary>
+        /// 获取图片信息
+        /// </summary>
+        /// <param name="imagePath"></param>
+        /// <returns></returns>
         public (int width, int height) GetImageDimensions(string imagePath)
         {
             using (var bmp = new Bitmap(imagePath))
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
index 2371800..a2e36e4 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
@@ -264,6 +264,14 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.GetTaskPicList(flightId, timestamp);
         }
+        
+        
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<CommandVideoResponse>> GetTaskVideoList(string flightId, long timestamp)
+        {
+            return await _app.GetTaskVideoList(flightId, timestamp);
+        }
 
         #endregion