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

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -967,5 +967,15 @@ namespace OpenAuth.App.ServiceApp
                 .ChangeRepository<SugarRepositiry<LasaTaskAssign>>()
                 .GetSingle(r => r.FlightId == flightId);
         }
+
+        public async Task<Response<LasaAirLine>> GetAirLine(string airLineId)
+        {
+            return new Response<LasaAirLine>()
+            {
+                Result = await Repository
+                    .ChangeRepository<SugarRepositiry<LasaAirLine>>()
+                    .GetSingleAsync(r => r.Id == airLineId)
+            };
+        }
     }
 }

OpenAuth.Repository/Domain/LasaAirLine.cs

@@ -28,5 +28,8 @@ namespace OpenAuth.Repository.Domain
         public DateTime? CreateTime { get; set; }                      // 创建时间
         public long CreateId { get; set; }                            // 创建人
         public string WPML { get; set; } // WPML 航线文件地址
+        
+        public float? TaskOffLng { get; set; }
+        public float? TaskOffLat { get; set; }
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -232,6 +232,16 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
             return result;
         }
+        /// <summary>
+        /// 航线详情
+        /// </summary>
+        /// <param name="airLineId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Response<LasaAirLine>> GetAirLine(string airLineId)
+        {
+            return await _app.GetAirLine(airLineId);
+        }
 
         /// <summary>
         /// 添加航线

OpenAuth.WebApi/Startup.cs

@@ -69,6 +69,7 @@ namespace OpenAuth.WebApi
 
             #endregion
 
+
             #region identityServer
 
             var identityServer =
@@ -169,6 +170,16 @@ namespace OpenAuth.WebApi
 
             #endregion
 
+            #region mqtt
+            services.AddSingleton<MqttMessageCenter>();
+            services.AddSingleton<IMqttMessageHandler, ThingRequestHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingServiceHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingOsdHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingEventHandler>();
+            //services.AddSingleton<IMqttMessageHandler, ThingDrcHandler>();
+            services.AddHostedService<MqttHostedService>();
+            #endregion
+
             #region AppSetting
 
             services.Configure<AppSetting>(Configuration.GetSection("AppSetting"));
@@ -330,18 +341,7 @@ namespace OpenAuth.WebApi
 
             #endregion
 
-            #region mqtt
-            services.AddSingleton<MqttMessageCenter>();
-            services.AddSingleton<IMqttMessageHandler, ThingRequestHandler>();
-            services.AddSingleton<IMqttMessageHandler, ThingServiceHandler>();
-            services.AddSingleton<IMqttMessageHandler, ThingOsdHandler>();
-            services.AddSingleton<IMqttMessageHandler, ThingEventHandler>();
-            //services.AddSingleton<IMqttMessageHandler, ThingDrcHandler>();
-            services.AddHostedService<MqttHostedService>();
-
-
-
-            #endregion
+            
         }
 
         public void ConfigureContainer(ContainerBuilder builder)