1. 集成mqtt

2. 任务库表添加字段

OpenAuth.Repository/Domain/LasaTask.cs

@@ -58,6 +58,15 @@ namespace OpenAuth.Repository.Domain
         /// </summary>
         public string AIInspection { get; set; }
         
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int  Status { get; set; }
+        /// <summary>
+        /// 周期公式
+        /// </summary>
+        public string PeriodicFormula { get; set; }
+
         public long CreateId { get; set; }
         public DateTime? CreateTime { get; set; }
 

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -1,5 +1,7 @@
-using Infrastructure;
+using System.Text;
+using Infrastructure;
 using Infrastructure.Extensions;
+using Infrastructure.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using OpenAuth.App.ServiceApp;
@@ -15,11 +17,16 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
     public class ManageController : ControllerBase
     {
         private readonly ManageApp _app;
-        public ManageController(ManageApp app)
+        private readonly MqttClientManager _mqttClientManager;
+
+        public ManageController(ManageApp app, MqttClientManager mqttClientManager)
         {
             _app = app;
+            _mqttClientManager = mqttClientManager;
         }
+
         #region 机场管理
+
         /// <summary>
         /// 获取机场列表
         /// </summary>
@@ -40,11 +47,14 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                 result.Code = 500;
                 result.Message = ex.Message;
             }
+
             return result;
         }
+
         #endregion
 
         #region 无人机管理
+
         /// <summary>
         /// 获取无人机列表
         /// </summary>
@@ -65,11 +75,14 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                 result.Code = 500;
                 result.Message = ex.Message;
             }
+
             return result;
         }
+
         #endregion
 
         #region 任务管理
+
         /// <summary>
         /// 获取任务列表
         /// </summary>
@@ -90,6 +103,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                 result.Code = 500;
                 result.Message = ex.Message;
             }
+
             return result;
         }
 
@@ -102,6 +116,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.AddTask(info);
         }
+
         /// <summary>
         /// 编辑任务
         /// </summary>
@@ -111,6 +126,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.EditTask(info);
         }
+
         /// <summary>
         /// 删除任务
         /// </summary>
@@ -120,9 +136,11 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.DeleteTask(id);
         }
+
         #endregion
 
         #region 航线管理
+
         /// <summary>
         /// 获取航线列表
         /// </summary>
@@ -143,6 +161,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                 result.Code = 500;
                 result.Message = ex.Message;
             }
+
             return result;
         }
 
@@ -155,6 +174,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.AddAirLine(info);
         }
+
         /// <summary>
         /// 编辑航线
         /// </summary>
@@ -164,6 +184,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.EditAirLine(info);
         }
+
         /// <summary>
         /// 删除航线
         /// </summary>
@@ -173,6 +194,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.DeleteAirLine(id);
         }
+
         /// <summary>
         /// 上传航线文件
         /// </summary>
@@ -197,6 +219,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
             return Ok(new { message = "上传成功", path = filePath });
         }
+
         [HttpPost("uploadwpmlfile")]
         [AllowAnonymous]
         public async Task<IActionResult> UploadWpmlFile(IFormFile xmlFile, string id)
@@ -217,9 +240,11 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
             return Ok(new { message = "上传成功", path = filePath });
         }
+
         #endregion
 
         #region 项目管理
+
         /// <summary>
         /// 获取项目列表
         /// </summary>
@@ -238,6 +263,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                 result.Code = 500;
                 result.Message = ex.Message;
             }
+
             return result;
         }
 
@@ -250,6 +276,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.AddWorkspace(info);
         }
+
         /// <summary>
         /// 编辑项目
         /// </summary>
@@ -259,6 +286,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.EditWorkspace(info);
         }
+
         /// <summary>
         /// 删除项目
         /// </summary>
@@ -268,6 +296,22 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.DeleteWorkspace(id);
         }
+
         #endregion
+
+        // 航线任务在云端的 共享查看、下发执行、取消以及进度上报等功能。
+
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task Test()
+        {
+            await _mqttClientManager.SubscribeAsync("thing/product/8UUXN5400A079H/osd", async (args) =>
+            {
+                var payload = args.ApplicationMessage.Payload;
+                var message = Encoding.UTF8.GetString(payload);
+                Console.WriteLine($"收到主题 [{args.ApplicationMessage.Topic}] 的消息: {message}");
+                await Task.CompletedTask; // 可选：实际逻辑中可执行更多异步操作
+            });
+        }
     }
 }

OpenAuth.WebApi/MqttClientManager.cs

@@ -0,0 +1,68 @@
+using MQTTnet;
+using MQTTnet.Client;
+using MQTTnet.Protocol;
+
+namespace OpenAuth.WebApi;
+
+public class MqttClientManager
+{
+    private IMqttClient _mqttClient;
+
+    public MqttClientManager()
+    {
+        var mqttFactory = new MqttFactory();
+        _mqttClient = mqttFactory.CreateMqttClient();
+        // 创建配置构建器
+        var builder = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+            .AddJsonFile(
+                $"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Development"}.json",
+                optional: true)
+            .AddEnvironmentVariables();
+        // 构建配置
+        var configuration = builder.Build();
+        // 读取连接字符串
+        var serverIp = configuration["MQTT:Server"];
+        var port = configuration["MQTT:Port"];
+        var username = configuration["MQTT:UserName"];
+        var password = configuration["MQTT:Password"];
+        ConnectAsync(serverIp, int.Parse(port), username, password).Wait();
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="server"></param>
+    /// <param name="port"></param>
+    /// <param name="username"></param>
+    /// <param name="password"></param>
+    public async Task ConnectAsync(string server, int port, string username = null, string password = null)
+    {
+        var mqttClientOptions = new MqttClientOptionsBuilder()
+            .WithClientId("client001")
+            .WithTcpServer(server, port)
+            .WithCredentials(username, password)
+            .Build();
+
+        await _mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
+    }
+
+    public async Task SubscribeAsync(string topic,
+        Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
+    {
+        await _mqttClient.SubscribeAsync(topic, MqttQualityOfServiceLevel.AtLeastOnce, CancellationToken.None);
+        _mqttClient.ApplicationMessageReceivedAsync += handler;
+    }
+
+
+    public async Task PublishAsync(string topic, string message)
+    {
+        var mqttMsg = new MqttApplicationMessageBuilder()
+            .WithTopic(topic)
+            .WithPayload(message)
+            .WithQualityOfServiceLevel(MqttQualityOfServiceLevel.AtLeastOnce)
+            .Build();
+        await _mqttClient.PublishAsync(mqttMsg, CancellationToken.None);
+    }
+}

OpenAuth.WebApi/Startup.cs

@@ -26,7 +26,6 @@ using SqlSugar;
 using Swashbuckle.AspNetCore.SwaggerUI;
 
 
-
 namespace OpenAuth.WebApi
 {
     public class Startup
@@ -46,7 +45,10 @@ namespace OpenAuth.WebApi
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddHttpContextAccessor();
+            services.AddSingleton<MqttClientManager>(provider => new MqttClientManager());
+
             #region log4net
+
             //在startup中需要强制创建log4net
             //var loggerFactory = LoggerFactory.Create(builder => { builder.AddLog4Net(); });
             //ILogger logger = loggerFactory.CreateLogger<Startup>();
@@ -56,9 +58,11 @@ namespace OpenAuth.WebApi
                 loggingBuilder.ClearProviders();
                 loggingBuilder.AddLog4Net();
             });
+
             #endregion
 
             #region identityServer
+
             var identityServer =
                 ((ConfigurationSection)Configuration.GetSection("AppSetting:IdentityServerUrl")).Value;
             if (!string.IsNullOrEmpty(identityServer))
@@ -73,9 +77,11 @@ namespace OpenAuth.WebApi
                         options.Audience = "openauthapi";
                     });
             }
+
             #endregion
 
             #region MiniProfiler
+
             // 添加MiniProfiler服务
             //services.AddMiniProfiler(options =>
             //{
@@ -89,13 +95,16 @@ namespace OpenAuth.WebApi
             //    options.SqlFormatter = new StackExchange.Profiling.SqlFormatters.InlineFormatter();
             //    //  options.IgnoredPaths.Add("/swagger/");
             //}).AddEntityFramework(); //显示SQL语句及耗时
+
             #endregion
 
             #region swagger
+
             //添加swagger
             services.AddSwaggerGen(option =>
             {
                 #region 注释
+
                 //foreach (var controller in GetControllers())
                 //{
                 //    var groupname = GetSwaggerGroupName(controller);
@@ -114,7 +123,9 @@ namespace OpenAuth.WebApi
                 //    option.IncludeXmlComments(name, includeControllerXmlComments: true);
 
                 //}
+
                 #endregion
+
                 option.CustomSchemaIds(type => type.FullName);
                 option.SwaggerDoc("v1", new OpenApiInfo
                 {
@@ -147,27 +158,29 @@ namespace OpenAuth.WebApi
 
             //    option.OperationFilter<GlobalHttpHeaderOperationFilter>(); // 添加httpHeader参数
             //});
+
             #endregion
 
             #region AppSetting
+
             services.Configure<AppSetting>(Configuration.GetSection("AppSetting"));
+
             #endregion
 
             #region 限制文件大小
-            services.Configure<KestrelServerOptions>(options =>
-            {
-                options.Limits.MaxRequestBodySize = long.MaxValue;
-            });
+
+            services.Configure<KestrelServerOptions>(options => { options.Limits.MaxRequestBodySize = long.MaxValue; });
             services.Configure<FormOptions>(x =>
             {
                 x.ValueLengthLimit = int.MaxValue;
                 x.MultipartBodyLengthLimit = long.MaxValue;
                 x.MemoryBufferThreshold = int.MaxValue;
-
             });
+
             #endregion
 
             #region Controllers
+
             services.AddControllers(option =>
                 {
                     option.Filters.Add<OpenAuthFilter>();
@@ -194,10 +207,13 @@ namespace OpenAuth.WebApi
                     //options.SerializerSettings.ContractResolver = new DefaultContractResolver();
                     options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
                 });
+
             #endregion
 
             #region MemoryCache
+
             services.AddMemoryCache();
+
             #endregion
 
             #region Cors
@@ -223,16 +239,15 @@ namespace OpenAuth.WebApi
                 //          .AllowAnyMethod()
                 //          .AllowAnyHeader());
             });
+
             #endregion
 
             #region SqlSugar
+
             ////没有直接 using SqlSugar，因为如果引用命名空间的话，会和Microsoft的一个GetTypeInfo存在二义性，所以就直接这么使用了
             services.AddScoped<ISqlSugarClient>(s =>
             {
-                StaticConfig.CustomSnowFlakeFunc = () =>
-                {
-                    return Yitter.IdGenerator.YitIdHelper.NextId();
-                };
+                StaticConfig.CustomSnowFlakeFunc = () => { return Yitter.IdGenerator.YitIdHelper.NextId(); };
 
                 var sqlSugar = new SqlSugarClient(new ConnectionConfig()
                     {
@@ -278,24 +293,34 @@ namespace OpenAuth.WebApi
                     });
                 return sqlSugar;
             });
-            services.AddScoped<SqlSugar.ISugarUnitOfWork<SugarDbContext>>(s => new SqlSugar.SugarUnitOfWork<SugarDbContext>(s.GetService<ISqlSugarClient>()));
+            services.AddScoped<SqlSugar.ISugarUnitOfWork<SugarDbContext>>(s =>
+                new SqlSugar.SugarUnitOfWork<SugarDbContext>(s.GetService<ISqlSugarClient>()));
+
             #endregion
 
             #region HttpClient
+
             services.AddHttpClient();
+
             #endregion
 
             #region DataProtection
+
             services.AddDataProtection().PersistKeysToFileSystem(new DirectoryInfo(Configuration["DataProtection"]));
+
             #endregion
 
             #region Quartz
+
             //设置定时启动的任务
-            services.AddHostedService<QuartzService>();
+            //services.AddHostedService<QuartzService>();
+
             #endregion
 
             #region SignalR
+
             services.AddSignalR();
+
             #endregion
         }
 
@@ -327,7 +352,8 @@ namespace OpenAuth.WebApi
                     //可以在这里为静态文件添加其他http头信息，默认添加跨域信息
                     ctx.Context.Response.Headers["Access-Control-Allow-Origin"] = "*";
                 },
-                ContentTypeProvider = new Microsoft.AspNetCore.StaticFiles.FileExtensionContentTypeProvider(new Dictionary<string, string>
+                ContentTypeProvider = new Microsoft.AspNetCore.StaticFiles.FileExtensionContentTypeProvider(
+                    new Dictionary<string, string>
                     {
                         { ".amr", "audio/AMR" },
                         { ".mp3", "audio/mpeg" },

OpenAuth.WebApi/appsettings.json

@@ -67,5 +67,11 @@
     "TiffStoreNamePrefix": "tiff_store",
     "TiffDir": "E:/tiff"
   },
-  "FlyImageDir": "e:/fly"
+  "FlyImageDir": "e:/fly",
+  "MQTT":{
+    "Server":  "175.27.168.120",
+    "Port": 6011, 
+    "UserName": "sdhc", 
+    "Password": ""
+  }
 }