机场和无人机固件管理

OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs

@@ -115,9 +115,9 @@ namespace OpenAuth.App.ServiceApp
                     {
                         Id = Guid.NewGuid().ToString(),
                         CreateTime = DateTime.Now,
-                        GatewayAccount="sdhc", 
+                        GatewayAccount = "sdhc",
                         GatewaySn = Guid.NewGuid().ToString("N").Substring(0, 8).ToUpper(), // 生成一个新的
-                        MqttGateway= "175.27.168.120:6011",
+                        MqttGateway = "175.27.168.120:6011",
                         MqttPassword = "",
                         OrgId = "371300", // 默认组织ID
                         BindStatus = 0 // 未绑定状态
@@ -144,7 +144,7 @@ namespace OpenAuth.App.ServiceApp
 
             }
         }
-        public async Task<bool> UpdateGateway(string gateway,string did)
+        public async Task<bool> UpdateGateway(string gateway, string did)
         {
             using (var db = UnitWork.CreateContext())
             {
@@ -173,10 +173,33 @@ namespace OpenAuth.App.ServiceApp
                 }
                 else
                 {
-                    return new  List<string>();
+                    return new List<string>();
                 }
             }
         }
+
+        #region 固件版本管理
+        public async Task<Response<bool>> AddFirmware(LasaFirmware info)
+        {
+            using (var db = UnitWork.CreateContext())
+            {
+                var flag = await db.LasaFirmware.InsertAsync(info);
+                if (db.Commit())
+                    return new Response<bool>
+                    {
+                        Result = true,
+                        Message = "添加成功"
+                    };
+                else
+                    return new Response<bool>
+                    {
+                        Result = false,
+                        Message = "添加失败"
+                    };
+            }
+        }
+        #endregion
+
         #region 健康报警
         /// <summary>
         /// 添加健康报警

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -80,6 +80,25 @@ namespace OpenAuth.App.ServiceApp
                     return new Response<bool> { Result = false, Message = "编辑失败" };
             }
         }
+        /// <summary>
+        /// 修改机场固件信息
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        public async Task<Response<bool>> EditDronePortFirmware(string id, string firmwareVersion)
+        {
+            using (var db = UnitWork.CreateContext())
+            {
+                var flag = await db.LasaDronePort.UpdateAsync(it => new LasaDronePort()
+                {
+                    FirmwareVersion = firmwareVersion
+                }, it => it.Id == id);
+                if (db.Commit())
+                    return new Response<bool> { Result = true, Message = "编辑成功" };
+                else
+                    return new Response<bool> { Result = false, Message = "编辑失败" };
+            }
+        }
 
         //删除机场信息
         public async Task<Response<bool>> DeleteDronePort(string id)
@@ -171,6 +190,27 @@ namespace OpenAuth.App.ServiceApp
             }
         }
 
+        /// <summary>
+        /// 修改无人机固件信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="firmwareVersion"></param>
+        /// <returns></returns>
+        public async Task<Response<bool>> EditUavFirmware(string id, string firmwareVersion)
+        {
+            using (var db = UnitWork.CreateContext())
+            {
+                var flag = await db.LasaUav.UpdateAsync(it => new LasaUav()
+                {
+                    FirmwareVersion = firmwareVersion
+                }, it => it.Id == id);
+                if (db.Commit())
+                    return new Response<bool> { Result = true, Message = "编辑成功" };
+                else
+                    return new Response<bool> { Result = false, Message = "编辑失败" };
+            }
+        }
+
         //删除无人机
         public async Task<Response<bool>> DeleteUav(string id)
         {

OpenAuth.Repository/Domain/LasaFirmware.cs

@@ -0,0 +1,51 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+
+namespace OpenAuth.Repository.Domain
+{
+    /// <summary>
+    /// 固件版本信息
+    /// </summary>
+    [SugarTable("lasa_firmware")]
+    public class LasaFirmware
+    {
+        /// <summary>
+        /// Desc:标识
+        /// Default:
+        /// Nullable:False
+        /// </summary>      
+        [SugarColumn(IsPrimaryKey = true)]
+        public string Id { get; set; }
+        /// <summary>
+        /// Desc:版本
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FirmwareVersion { get; set; }
+
+        /// <summary>
+        /// Desc:地址
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string FirmwarePath { get; set; }
+
+        /// <summary>
+        /// Desc:创建时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// Desc:1-机场固件版本，2-无人机固件版本
+        /// Default:
+        /// Nullable:True
+        public int Type { get; set; }
+
+    }
+}

OpenAuth.Repository/SugarDbContext.cs

@@ -74,6 +74,7 @@ namespace OpenAuth.Repository
         public SugarRepositiry<LasaGateway> LasaGateway { get; set; }
         public SugarRepositiry<LasaManageDeviceHms> LasaManageDeviceHms { get; set; }
         public SugarRepositiry<LasaLog> LasaLog { get; set; }
+        public SugarRepositiry<LasaFirmware> LasaFirmware { get; set; }
         #endregion
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs

@@ -110,6 +110,30 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             return result;
         }
 
+        #region 固件版本管理
+        /// <summary>
+        /// 添加固件版本
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<Response<bool>> AddFirmware(LasaFirmware info)
+        {
+            var result = new Response<bool>();
+            try
+            {
+                result = await _app.AddFirmware(info);
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.Message;
+            }
+            return result;
+        }
+        #endregion
+
         /// <summary>
         /// 切换相机
         /// </summary>

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -65,6 +65,17 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.EditDronePort(info);
         }
+        /// <summary>
+        /// 修改机场固件信息
+        /// </summary>
+        /// <param name="id">机场id</param>
+        /// <param name="firmwareVersion">机场版本</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<bool>> EditDronePortFirmware(string id, string firmwareVersion)
+        {
+            return await _app.EditDronePortFirmware(id, firmwareVersion);
+        }
 
         /// <summary>
         /// 删除机场
@@ -114,7 +125,17 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.EditUav(info);
         }
-
+        /// <summary>
+        /// 修改无人机固件信息
+        /// </summary>
+        /// <param name="id">无人机id</param>
+        /// <param name="firmwareVersion">机场版本</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<bool>> EditUavFirmware(string id, string firmwareVersion)
+        {
+            return await _app.EditUavFirmware(id, firmwareVersion);
+        }
         /// <summary>
         /// 删除无人机
         /// </summary>
@@ -409,7 +430,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         [AllowAnonymous] // todo  临沂 
         public async Task<string> ExecuteFlyTask(string taskId)
         {
-           return await _app.ExecuteFlyTask(taskId);
+            return await _app.ExecuteFlyTask(taskId);
         }
 
         /// <summary>
@@ -426,7 +447,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         [AllowAnonymous]
         public async Task<string> TestExecuteFlyTask(string flightid)
         {
-          return  await _app.TestExecuteFlyTask(flightid);
+            return await _app.TestExecuteFlyTask(flightid);
         }
 
         /// <summary>
@@ -541,12 +562,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="type">区域类型（作业区，限飞区等）</param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<List<LasaShpData>>> GetWorkAreaList(string workspaceid,int? state,string type)
+        public async Task<Response<List<LasaShpData>>> GetWorkAreaList(string workspaceid, int? state, string type)
         {
             var result = new Response<List<LasaShpData>>();
             try
             {
-                result = await _app.GetWorkAreaList(workspaceid,state,type);
+                result = await _app.GetWorkAreaList(workspaceid, state, type);
             }
             catch (Exception ex)
             {