From 04be63963e01cfad2e7b079e12a22abbb80d6574 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Mon, 1 Dec 2025 10:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs    | 13 +++++++------
 .../AirportMaintenanceController.cs                 |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs
index ba4b15d..1f68496 100644
--- a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs
+++ b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs
@@ -18,6 +18,7 @@ using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -557,7 +558,7 @@ namespace OpenAuth.App.ServiceApp
 
         #region 天气阻飞
         //天气预报和是否有人在操作
-        public async Task<Response<string>> IsCanFly(string sn, string dock, string address = "兰山")
+        public async Task<Response<dynamic>> IsCanFly(string sn, string dock, string address = "兰山")
         {
             var rainThreshforecast = 3; // 天气预报雨量
             var windSpeedThresh = 12;// 机场设定雨量
@@ -567,7 +568,7 @@ namespace OpenAuth.App.ServiceApp
             var existingLocked = await _redisCacheContext.SetMembersAsync("locked_devices");
             islock = existingLocked.Any(u => u == sn);
             if (islock)
-                return new Response<string> { Code = 500, Result = "设备已锁定", Message = "设备已锁定" };
+                return new Response<dynamic> { Result = new { status = false, msg = "设备已锁定" } };
             switch (dock)
             {
                 case "Dock 1":
@@ -604,17 +605,17 @@ namespace OpenAuth.App.ServiceApp
                 var rainfall = dataObject["data"]?["rainfall"]?.Value<int>();
                 var drone_in_dock = dataObject["data"]?["drone_in_dock"]?.Value<string>();
                 if (drone_in_dock == "0")
-                    return new Response<string> { Code = 500, Result = "执行任务中，请勿重复起飞" };
+                    return new Response<dynamic> { Result = new { status = false, msg = "执行任务中，请勿重复起飞" } };
                 if (windSpeedThresh <= windSpeed || rainThreshforecast <= rainfall || weatherWindSpeedThre <= weatherWindSpeedforecast)
                 {
-                    return new Response<string> { Code = 500, Result = "当前天气条件不允许起飞" };
+                    return new Response<dynamic> { Result = new { status = false, msg = "当前天气条件不允许起飞" } };
                 }
                 else
                 {
-                    return new Response<string> { Code = 200, Result = "当前天气条件允许起飞" };
+                    return new Response<dynamic> { Result = new { status = true, msg = "当前天气条件允许起飞" } };
                 }
             }
-            return new Response<string> { Code = 500, Result = "当前天气条件允许起飞" };
+            return new Response<dynamic> { Result = new { status = true, msg = "当前天气条件允许起飞" } };
 
         }
         #endregion
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs
index 8c13dcd..e819744 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs
@@ -748,9 +748,9 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <returns></returns>
         [HttpGet]
         [AllowAnonymous]
-        public async Task<Response<string>> IsCanFly(string address, string sn, string dock)
+        public async Task<Response<dynamic>> IsCanFly(string address, string sn, string dock)
         {
-            var result = new Response<string>();
+            var result = new Response<dynamic>();
             try
             {
                 result = await _app.IsCanFly(sn, dock, address);