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

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -2535,11 +2535,11 @@ namespace OpenAuth.App.ServiceApp
             {
                 db.Ado.BeginTran();
                 await db.Updateable(task).IgnoreNullColumns().ExecuteCommandAsync();
-                var config = ConfigHelper.GetConfigRoot();
+                /*var config = ConfigHelper.GetConfigRoot();
                 var url = config["AIModelApi:Url"];
                 // 结束智能巡检
                 using var httpClient = new HttpClient();
-                await httpClient.PostAsync($"{url}/stop_detection", null);
+                await httpClient.PostAsync($"{url}/stop_detection", null);*/
                 db.Ado.CommitTran();
             }
             catch (Exception ex)

OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs

@@ -319,7 +319,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                         {
                             string xLcSecret = _helper.getxseret();
                             // 转换为字节数组
-                            byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(result));
+                            byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(inResult));
                             var encryptedResData = _helper.Encrypt(bytes);
                             response.Result = encryptedResData;
                             response.Message = "获取无人机状态成功！";
@@ -337,11 +337,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                             response.Code = 500;
                             response.Secret = xLcSecret;
                         }
-                        result.data = inResult.Result;
-                        result.code = inResult.Code;
-                        result.message = inResult.Message;
+
+                        result.data = response.Result;
+                        result.code = response.Code;
+                        result.message = response.Message;
                         result.traceid = Guid.NewGuid().ToString();
-                        Response.Headers.Add("x-lc-secret", inResult.Secret);
+                        Response.Headers.Add("x-lc-secret", response.Secret);
                     }
                     catch (Exception ex)
                     {

OpenAuth.WebApi/Startup.cs

@@ -27,6 +27,7 @@ using OpenAuth.Repository;
 using OpenAuth.WebApi.Model;
 using OpenAuth.WebApi.Model.mqtt;
 using OpenAuth.WebApi.Model.RabbitMQService;
+using OpenAuth.WebApi.SystemTask;
 using SqlSugar;
 using Swashbuckle.AspNetCore.SwaggerUI;
 using Yitter.IdGenerator;
@@ -183,9 +184,11 @@ namespace OpenAuth.WebApi
             services.AddHostedService<MqttHostedService>();
             #endregion
 
+            services.AddHostedService<DelayedExecutionService>();
+            
             #region rabbitmq
-            services.AddSingleton<RabbitMqListenerService>();
-            services.AddHostedService(sp => sp.GetRequiredService<RabbitMqListenerService>());
+            //services.AddSingleton<RabbitMqListenerService>();
+            //services.AddHostedService(sp => sp.GetRequiredService<RabbitMqListenerService>());
             #endregion
 
             #region AppSetting