机场注册去掉重复注册

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -122,6 +122,8 @@ namespace OpenAuth.App.ServiceApp
         {
             using (var db = UnitWork.CreateContext())
             {
+                if (db.LasaDronePort.GetFirst(r => r.Sn == info.Sn) != null)
+                    return false;
                 var flag = db.LasaDronePort.Insert(info);
                 if (db.Commit())
                     return true;
@@ -271,6 +273,8 @@ namespace OpenAuth.App.ServiceApp
         {
             using (var db = UnitWork.CreateContext())
             {
+                if (db.LasaUav.GetFirst(r => r.Sn == info.Sn) != null)
+                    return false;
                 var flag = db.LasaUav.Insert(info);
                 if (db.Commit())
                     return true;

OpenAuth.Repository/Domain/LasaDeviceDictionary.cs

@@ -0,0 +1,24 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.Repository.Domain
+{
+    /// <summary>
+    /// 设备类型字典
+    /// </summary>
+    [SugarTable("lasa_devicedictionary‌")]
+    public class LasaDeviceDictionary
+    {
+        [SugarColumn(IsPrimaryKey = true)]
+        public string Id { get; set; }
+        public int Domain { get; set; }
+        public int DeviceType { get; set; }
+        public int SubType { get; set; }
+        public string DeviceName { get; set; }
+        public string DeviceDesc { get; set; }
+    }
+}

OpenAuth.Repository/SugarDbContext.cs

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

OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs

@@ -161,7 +161,7 @@ namespace OpenAuth.WebApi.Model.mqtt
                             lasaDronePort.TypeId = "Dock 3";
                             lasaDronePort.Sn = obj["sn"].ToString();
                             lasaDronePort.BindStatus = 1;
-                            lasaDronePort.Name = "机场";
+                            lasaDronePort.Name = obj["device_callsign"]?.ToString();
                             dronesn = obj["sn"].ToString();
                             lasaDronePort.GateWay = getway;
                         }
@@ -173,7 +173,7 @@ namespace OpenAuth.WebApi.Model.mqtt
                             lasaUav.TypeId = "M4TD";
                             lasaUav.Sn = obj["sn"].ToString();
                             lasaUav.PId = lasaDronePort.Id;
-                            lasaUav.Name = "飞行器";
+                            lasaUav.Name = obj["device_callsign"]?.ToString();
                             uavsn = obj["sn"].ToString();
                         }
                     }