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<bool> { Result = false, Message = "设备已锁定" };
             switch (dock)
             {
                 case "Dock":
@@ -597,9 +602,12 @@ namespace OpenAuth.App.ServiceApp
                 var dataObject = JsonConvert.DeserializeObject<JObject>(info);
                 var windSpeed = dataObject["data"]?["wind_speed"]?.Value<float>(); // m/s
                 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<bool> { Result = false, Message = "执行任务中，请勿重复起飞" };
                 if (windSpeedThresh <= windSpeed || rainThreshforecast <= rainfall || weatherWindSpeedThre <= weatherWindSpeedforecast)
                 {
-                    return new Response<bool> { Result = false,Message= "当前天气条件不允许起飞" };
+                    return new Response<bool> { Result = false, Message = "当前天气条件不允许起飞" };
                 }
                 else
                 {