Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/LASAPlatform

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -367,15 +367,18 @@ namespace OpenAuth.App.ServiceApp
         {
             using (var db = UnitWork.CreateContext())
             {
-                int[] uavtype = info.TypeId.Split('-', StringSplitOptions.RemoveEmptyEntries).Select(x => int.Parse(x)).ToArray();
+                int[] uavtype = info.TypeId.Split('-', StringSplitOptions.RemoveEmptyEntries).Select(x => int.Parse(x))
+                    .ToArray();
                 if (uavtype.Length == 3)
                 {
-                    var devicename =  db.LasaDeviceDictionary.AsQueryable().Where(r => r.Domain == uavtype[0] && r.DeviceType == uavtype[1] && r.SubType == uavtype[2]).First();
+                    var devicename = db.LasaDeviceDictionary.AsQueryable().Where(r =>
+                        r.Domain == uavtype[0] && r.DeviceType == uavtype[1] && r.SubType == uavtype[2]).First();
                     if (devicename != null)
                     {
                         info.TypeId = devicename.DeviceName;
                     }
                 }
+
                 var flag = db.LasaUav.Insert(info);
                 if (db.Commit())
                     return true;
@@ -2538,11 +2541,14 @@ namespace OpenAuth.App.ServiceApp
                         aiInspection.WarningContent = req.WarningContent;
                     }
 
-                    // 更新
-                    // todo 关于多次调用问题
+                    //  关于多次调用问题
                     var count = await db.Queryable<LasaAiInspection>().Where(x => x.TaskId == req.TaskId).CountAsync();
                     if (count == 0)
                     {
+                        // 设置任务智能巡检标识
+                        task.AIInspection = "true";
+                        task.Status = 3; // 表示智能巡检中
+                        await db.Updateable(task).ExecuteCommandAsync();
                         await db.Insertable(aiInspection).ExecuteCommandAsync();
                     }
                 }
@@ -2653,8 +2659,20 @@ namespace OpenAuth.App.ServiceApp
             };
         }
 
-        public async Task<Response<bool>> EndHandFlyTask(string taskid)
+        public async Task<Response<dynamic>> EndHandFlyTask(string taskid)
         {
+            var savedTask = await Repository.ChangeRepository<SugarRepositiry<LasaTask>>().AsQueryable()
+                .Where(x => x.Id == taskid)
+                .FirstAsync();
+            if (savedTask.Status == 3)
+            {
+                return new Response<dynamic>()
+                {
+                    Result = false,
+                    Message = "智能巡检未关闭"
+                };
+            }
+
             var task = new LasaTask()
             {
                 Id = taskid,
@@ -2680,9 +2698,11 @@ namespace OpenAuth.App.ServiceApp
                 throw new Exception("结束任务失败");
             }
 
-            return new Response<bool>()
+            return new Response<dynamic>()
             {
-                Result = true
+                Result = await Repository.ChangeRepository<SugarRepositiry<LasaTask>>().AsQueryable()
+                    .Where(x => x.Id == taskid)
+                    .FirstAsync()
             };
         }
 
@@ -3018,6 +3038,7 @@ WHERE
 
 
         #region redis获取数据
+
         public async Task<Response<string>> GetDronePortInfoFromRedis(string key)
         {
             var info = _redisCacheContext.Get<string>(key);
@@ -3028,12 +3049,14 @@ WHERE
                     Result = info
                 };
             }
+
             return new Response<string>
             {
                 Message = "暂无数据",
                 Code = 500
             };
         }
+
         #endregion
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -927,7 +927,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="taskid"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<Response<bool>> EndHandFlyTask(string taskid)
+        public async Task<Response<dynamic>> EndHandFlyTask(string taskid)
         {
             return await _app.EndHandFlyTask(taskid);
         }