From 19a3a737beebab85e94ab29463fbf4710801c5e2 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Sat, 29 Nov 2025 14:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=98=BB=E9=A3=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs index 6964b07..1cd01ad 100644 --- a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs +++ b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs @@ -563,6 +563,11 @@ namespace OpenAuth.App.ServiceApp var windSpeedThresh = 12;// 机场设定雨量 double weatherWindSpeedforecast = 0; // 天气预报风速 double weatherWindSpeedThre = 12;// 机场设定风速 + bool islock = false;//是否有人在操作 + var existingLocked = await _redisCacheContext.SetMembersAsync("locked_devices"); + islock = existingLocked.Any(u => u == sn); + if (islock) + return new Response { Result = false, Message = "设备已锁定" }; switch (dock) { case "Dock": @@ -597,9 +602,12 @@ namespace OpenAuth.App.ServiceApp var dataObject = JsonConvert.DeserializeObject(info); var windSpeed = dataObject["data"]?["wind_speed"]?.Value(); // m/s var rainfall = dataObject["data"]?["rainfall"]?.Value(); + var drone_in_dock = dataObject["data"]?["drone_in_dock"]?.Value(); + if (drone_in_dock == "0") + return new Response { Result = false, Message = "执行任务中，请勿重复起飞" }; if (windSpeedThresh <= windSpeed || rainThreshforecast <= rainfall || weatherWindSpeedThre <= weatherWindSpeedforecast) { - return new Response { Result = false,Message= "当前天气条件不允许起飞" }; + return new Response { Result = false, Message = "当前天气条件不允许起飞" }; } else {