省任务无人机状态信息获取

OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs

@@ -684,7 +684,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
             {
                 data.code = 200;
                 dynamic inData = new ExpandoObject();
-                inData.mode_code = 1;
+                inData.mode_code = 1; // 不在线
                 data.message = "获取无人机状态成功";
             }
             else
@@ -750,11 +750,10 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
 
                             inData.gps_state = quality switch
                             {
-                                < 2 => 1,
-                                < 10 => 2,
-                                _ => 3
+                                < 2 => 1, // 低精度
+                                < 10 => 2, // 高精度
+                                _ => 3 // rtk定位
                             };
-                            // 1： 低精度；2：高精度；3：rtk定位
                             data.data = inData;
                             data.message = "获取无人机状态成功！";
                             data.traceid = Guid.NewGuid().ToString();
@@ -767,9 +766,28 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
                     }
                     else
                     {
-                        // todo 补充无人机状态信息
                         // 舱内 关机或者开机状态
                         // 这里取机场osd日志信息
+                        dynamic inData = new ExpandoObject();
+                        inData.battery_capacity_percent =
+                            dockOsdData["data"]?["drone_charge_state"]?["capacity_percent"]?.Value<int>();
+                        inData.elevation = 0;
+                        inData.mode_code = 0;
+                        var longitude = Math.Round(dockOsdData["data"]?["longitude"]?.Value<decimal>() ?? 0m, 7);
+                        var latitude = Math.Round(dockOsdData["data"]?["latitude"]?.Value<decimal>() ?? 0m, 7);
+                        var height = Math.Round(dockOsdData["data"]?["height"]?.Value<decimal>() ?? 0m, 2);
+                        inData.longitude = longitude;
+                        inData.latitude = latitude;
+                        inData.height = height;
+                        var quality = dockOsdData["data"]?["position_state"]?["quality"]?.Value<int>();
+                        inData.gps_state = quality switch
+                        {
+                            < 2 => 1,
+                            < 10 => 2,
+                            _ => 3
+                        };
+                        data.data = inData;
+                        data.traceid = Guid.NewGuid().ToString();
                         data.code = 200;
                         data.message = "获取无人机状态成功";
                     }

OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs

@@ -290,6 +290,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         }
 
 
+        /// <summary>
+        /// 省任务获取无人机状态信息
+        /// </summary>
+        /// <param name="deviceid"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
         [HttpGet]
         [AllowAnonymous]
         [Route("/zhcfzx/droneAirport/getDroneStatus")]
@@ -299,6 +305,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             var result = new ReciveData<string>();
             if (Request.Headers.TryGetValue("x-lc-token", out var tokenValue))
             {
+                // todo 完成后，需要恢复
                 //var tokenflag = _helper.Verify(tokenValue);
                 var tokenflag = true;
                 if (tokenflag)
@@ -562,7 +569,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
         [HttpGet]
         [AllowAnonymous]
-
         public async Task<ReciveData<string>> dbupload (string taskid)
         {
             var result = new ReciveData<string>();