From 0e1e9bf7b6abe8000cc2b17221f580ee18efaf0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com>
Date: Fri, 18 Jul 2025 10:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E5=AF=B9=E6=8E=A5=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=87=86=E5=A4=87=E9=98=B6=E6=AE=B5=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/ManageApp.cs   | 28 ++++++++++++++++++++++++++
 OpenAuth.Repository/Domain/LasaTask.cs |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/OpenAuth.App/ServiceApp/ManageApp.cs b/OpenAuth.App/ServiceApp/ManageApp.cs
index 3558a4f..0e62e48 100644
--- a/OpenAuth.App/ServiceApp/ManageApp.cs
+++ b/OpenAuth.App/ServiceApp/ManageApp.cs
@@ -366,6 +366,7 @@ namespace OpenAuth.App.ServiceApp
                 task.CreateId = user.Id;
                 task.CreateUserName = user.Name;
                 task.CreateTime = DateTime.Now;
+                //task.FlightId = Guid.NewGuid().ToString();
                 // todo 添加一些航线信息
                 //  如：执行时长，单次定时的时间
                 // 0-飞行计划 1-指点飞行
@@ -401,6 +402,12 @@ namespace OpenAuth.App.ServiceApp
             }
         }
 
+        /// <summary>
+        /// 已禁止使用
+        /// </summary>
+        /// <param name="task"></param>
+        /// <returns></returns>
+        [Obsolete]
         //编辑任务
         public async Task<Response<bool>> EditTask(LasaTask task)
         {
@@ -835,6 +842,27 @@ namespace OpenAuth.App.ServiceApp
 
             dynamic data = new ExpandoObject();
             data.flight_id = Guid.NewGuid().ToString(); // 用任务id 作为
+            // external 
+            if (!string.IsNullOrEmpty(task.ExternalTaskId))
+            {
+                // 关联detail 
+                var detail = await Repository
+                    .ChangeRepository<SugarRepositiry<DroneDocktaskdetail>>()
+                    .GetSingleAsync(r => r.id == task.ExternalTaskId);
+                if (detail == null)
+                {
+                    throw new Exception("找不到原始省任务");
+                }
+
+                var record = new DroneDocktaskdetail();
+                record.id = task.ExternalTaskId;
+                record.flighttaskid = data.flight_id;
+                await Repository.ChangeRepository<SugarRepositiry<DroneDocktaskdetail>>()
+                    .AsUpdateable(record)
+                    .IgnoreNullColumns()
+                    .ExecuteCommandAsync();
+            }
+
             data.execute_time = DateTimeOffset.Now.ToUnixTimeMilliseconds();
             //{"0":"立即任务","1":"定时任务","2":"条件任务"}
             // 立即任务和定时任务均由execute_time指定执行时间；条件任务支持ready_conditions字段指定任务就绪条件，设备可在指定时间段内满足就绪条件后即可执行；立即任务媒体上传优先级最高，定时任务和条件任务媒体上传优先级相同
diff --git a/OpenAuth.Repository/Domain/LasaTask.cs b/OpenAuth.Repository/Domain/LasaTask.cs
index bffe500..68bbe3d 100644
--- a/OpenAuth.Repository/Domain/LasaTask.cs
+++ b/OpenAuth.Repository/Domain/LasaTask.cs
@@ -136,5 +136,7 @@ namespace OpenAuth.Repository.Domain
         public string? Reason { get; set; }
         
         public int? FlightTaskType { get; set; }
+        
+        public string ExternalTaskId { get; set; }
     }
 }
\ No newline at end of file