1. 手工任务保存接口

2. 智能巡检开始接口

OpenAuth.App/ServiceApp/FlyTask/Request/CallAiModel.cs

@@ -0,0 +1,29 @@
+namespace OpenAuth.App.ServiceApp.FlyTask.Request;
+
+public class CallAiModel
+{
+    /// <summary>
+    /// 飞行任务id
+    /// </summary>
+    public string TaskId { get; set; }
+
+    /// <summary>
+    ///算法实例id
+    /// </summary>
+    public string AlgoInstanceId { get; set; }
+
+    /// <summary>
+    /// 直播推流地址
+    /// </summary>
+    public string RtmpUrl { get; set; }
+
+    /// <summary>
+    /// 告警标题
+    /// </summary>
+    public string WarningTitle { get; set; }
+
+    /// <summary>
+    /// 告警内容
+    /// </summary>
+    public string WarningContent { get; set; }
+}

OpenAuth.App/ServiceApp/FlyTask/Request/LasaHandFlyTask.cs

@@ -0,0 +1,7 @@
+namespace OpenAuth.App.ServiceApp.FlyTask.Request;
+
+public class LasaHandFlyTask
+{
+    public string TaskName { get; set; }
+    public string FlightId { get; set; }
+}

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -22,6 +22,7 @@ using OpenAuth.App.BasicQueryService;
 using OpenAuth.App.Interface;
 using OpenAuth.App.Request;
 using OpenAuth.App.ServiceApp.AirLine.Request;
+using OpenAuth.App.ServiceApp.FlyTask.Request;
 using OpenAuth.App.ServiceApp.FlyTask.Response;
 using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.App.ServiceApp.Response;
@@ -416,7 +417,7 @@ namespace OpenAuth.App.ServiceApp
                 task.CreateTime = DateTime.Now;
                 //task.FlightId = Guid.NewGuid().ToString();
                 //  如：执行时长，单次定时的时间
-                // 0-飞行计划 1-指点飞行
+                // 0-飞行计划 1-手飞任务
                 task.FlightTaskType = 0; //
                 task.PlanExecuteDuration = airLine.ScheduleTime;
                 task.ExpectedFileCount = airLine.PictureTotal;
@@ -433,6 +434,7 @@ namespace OpenAuth.App.ServiceApp
                     };
                     await db.LasaAiInspection.InsertAsync(aiInspection);
                 }
+
                 //   //{"0":"立即任务","1":"定时任务",
                 var type = task.TaskType;
                 if (type.Equals(1) || type.Equals(2)) // 定时任务
@@ -2345,5 +2347,53 @@ namespace OpenAuth.App.ServiceApp
                 Result = true
             };
         }
+
+        /// <summary>
+        /// 保存手飞任务信息
+        /// </summary>
+        /// <param name="task"></param>
+        /// <returns></returns>
+        public async Task<Response<dynamic>> SaveHandFlyTask(LasaHandFlyTask task)
+        {
+            var date = DateTime.Now;
+            var lasaTask = new LasaTask
+            {
+                Id = Guid.NewGuid().ToString(),
+                TaskName = task.TaskName,
+                TaskType = 0,
+                //0 计划任务 1 手飞任务
+                FlightTaskType = 1,
+                FlightId = task.FlightId,
+                Status = 0, // 待执行
+                CreateTime = date,
+                ScheduledStartTime = date, // 任务计划执行时间
+                ExecuteTime = date // 任务开始执行时间
+            };
+            await Repository.ChangeRepository<SugarRepositiry<LasaTask>>().InsertAsync(lasaTask);
+            return new Response<dynamic>()
+            {
+                Result = new
+                {
+                    taskId = lasaTask.Id
+                }
+            };
+        }
+
+        public async Task<Response<bool>> CallAiModel(CallAiModel req)
+        {
+            var aiInspection = new LasaAiInspection
+            {
+                Id = Guid.NewGuid().ToString(),
+                TaskId = req.TaskId,
+                AlgoInstanceId = req.AlgoInstanceId,
+                WarningTitle = req.WarningTitle,
+                WarningContent = req.WarningContent
+            };
+            await Repository.ChangeRepository<SugarRepositiry<LasaAiInspection>>().InsertAsync(aiInspection);
+            return new Response<bool>()
+            {
+                Result = true
+            };
+        }
     }
 }

OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs

@@ -266,8 +266,6 @@ public class ConfigSubscribe : IJob
                                 CreateTime = date,
                             };
                             await _sqlSugarClient.Insertable(parent1).ExecuteCommandAsync();
-                            
-                            // todo 关于生成手飞任务的问题
                         }
 
                         // 重复检测

OpenAuth.Repository/Domain/LasaTask.cs

@@ -23,7 +23,7 @@ namespace OpenAuth.Repository.Domain
         /// 任务名称
         /// </summary>
         public string TaskName { get; set; }
-        
+
         public string CreateUserName { get; set; }
 
         /// <summary>
@@ -31,11 +31,11 @@ namespace OpenAuth.Repository.Domain
         /// </summary>
         public int? TaskType { get; set; }
 
-        
+
         public string TaskAirLineName { get; set; }
-        
+
         public string TaskDronePortName { get; set; }
-        
+
         /// <summary>
         /// 执行机场
         /// </summary>
@@ -130,22 +130,32 @@ namespace OpenAuth.Repository.Domain
         /// 已上传媒体数量
         /// </summary>
         public int? UploadedFileCount { get; set; }
-        
+
+        /// <summary>
+        /// 计划id
+        /// </summary>
         public string FlightId { get; set; }
-        
+
+        // 飞行任务失败原因
         public string? Reason { get; set; }
-        
+
+        /// <summary>
+        ///  0-飞行计划 1-手飞任务
+        /// </summary>
         public int? FlightTaskType { get; set; }
-        
+
+        /// <summary>
+        /// 省任务detail id 
+        /// </summary>
         public string ExternalTaskId { get; set; }
-        
+
+        /// <summary>
+        /// 断点信息
+        /// </summary>
         public string BreakPoint { get; set; }
-        
-        [SugarColumn(IsIgnore =  true)]
-        public string AlgoInstanceId { get; set; }
-        [SugarColumn(IsIgnore =  true)]
-        public string WarningTitle { get; set; }
-        [SugarColumn(IsIgnore =  true)]
-        public string WarningContent { get; set; }
+
+        [SugarColumn(IsIgnore = true)] public string AlgoInstanceId { get; set; }
+        [SugarColumn(IsIgnore = true)] public string WarningTitle { get; set; }
+        [SugarColumn(IsIgnore = true)] public string WarningContent { get; set; }
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OpenAuth.App.ServiceApp;
 using OpenAuth.App.ServiceApp.AirLine.Request;
+using OpenAuth.App.ServiceApp.FlyTask.Request;
 using OpenAuth.App.ServiceApp.FlyTask.Response;
 using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.App.ServiceApp.Response;
@@ -837,27 +838,52 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.ListMediaFolder(workspaceId);
         }
+
         /// <summary>
         /// 媒体库新建文件夹记录
         /// </summary>
         /// <returns></returns>
         /// todo  应该传什么参数？
         [HttpPost]
-        public async Task<Response<bool>> CreateMediaFolder(string name ,string parentKey)
+        public async Task<Response<bool>> CreateMediaFolder(string name, string parentKey)
         {
-            return await _app.CreateMediaFolder(name,parentKey);
+            return await _app.CreateMediaFolder(name, parentKey);
         }
+
         #endregion
-        
+
         /// <summary>
         ///  媒体保存测试
         /// </summary>
-        /// <param name="msg"></param>
+        /// <param name="msg">mqtt message</param>
         /// <returns></returns>
         [HttpPost]
         public async Task<Response<bool>> Test1111(string msg)
         {
             return await _app.Test1111(msg);
         }
+
+        /// <summary>
+        /// 手飞任务保存接口
+        /// </summary>
+        /// <param name="task"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<dynamic>> SaveHandFlyTask([FromBody] LasaHandFlyTask task)
+        {
+            return await _app.SaveHandFlyTask(task);
+        }
+
+        /// <summary>
+        /// 开启智能（Ai）巡检
+        /// </summary>
+        /// <param name="task"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<bool>> CallAiModel([FromBody] CallAiModel req)
+        {
+            return await _app.CallAiModel(req);
+            return  null;
+        }
     }
 }