订阅机场信息
parent
41820b4df0
commit
e72b868938
|
|
@ -147,7 +147,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
|
||||||
return await _app.DeleteUav(id);
|
return await _app.DeleteUav(id);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取机场sn获取无人机列表
|
/// 根据机场sn获取无人机列表
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="pageIndex"></param>
|
/// <param name="pageIndex"></param>
|
||||||
/// <param name="pageSize"></param>
|
/// <param name="pageSize"></param>
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ namespace OpenAuth.WebApi.Model.mqtt
|
||||||
{
|
{
|
||||||
$"thing/product/{gateway}/osd",
|
$"thing/product/{gateway}/osd",
|
||||||
$"thing/product/{gateway}/events",
|
$"thing/product/{gateway}/events",
|
||||||
$"thing/product/{gateway}/requests",
|
$"thing/product/{gateway}/requests1",
|
||||||
$"thing/product/{gateway}/services_reply",
|
$"thing/product/{gateway}/services_reply",
|
||||||
//$"thing/product/{gateway}/drc/up",
|
//$"thing/product/{gateway}/drc/up",
|
||||||
//$"thing/product/{gateway}/drc/down",
|
//$"thing/product/{gateway}/drc/down",
|
||||||
|
|
|
||||||
|
|
@ -12,13 +12,15 @@ namespace OpenAuth.WebApi.Model.mqtt
|
||||||
private readonly MqttClientManager _mqttClientManager;
|
private readonly MqttClientManager _mqttClientManager;
|
||||||
AirportMaintenanceApp _app;
|
AirportMaintenanceApp _app;
|
||||||
ManageApp _manageApp;
|
ManageApp _manageApp;
|
||||||
|
private readonly MqttMessageCenter _mqttCenter;
|
||||||
|
|
||||||
public ThingRequestHandler(ILogger<ThingRequestHandler> logger, MqttClientManager mqttClientManager, AirportMaintenanceApp app, ManageApp manageApp)
|
public ThingRequestHandler(ILogger<ThingRequestHandler> logger, MqttClientManager mqttClientManager, AirportMaintenanceApp app, ManageApp manageApp, MqttMessageCenter mqttCenter)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_mqttClientManager = mqttClientManager;
|
_mqttClientManager = mqttClientManager;
|
||||||
_app = app;
|
_app = app;
|
||||||
_manageApp = manageApp;
|
_manageApp = manageApp;
|
||||||
|
_mqttCenter = mqttCenter;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool CanHandle(string topic)
|
public bool CanHandle(string topic)
|
||||||
|
|
@ -30,7 +32,7 @@ namespace OpenAuth.WebApi.Model.mqtt
|
||||||
public async Task HandleAsync(string topic, string payload)
|
public async Task HandleAsync(string topic, string payload)
|
||||||
{
|
{
|
||||||
_logger.LogError($"[Request] Topic={topic}, Payload={payload}");
|
_logger.LogError($"[Request] Topic={topic}, Payload={payload}");
|
||||||
if (payload.Contains("update_topo"))
|
if (payload.Contains("config"))
|
||||||
{
|
{
|
||||||
var root = JsonNode.Parse(payload)?.AsObject();
|
var root = JsonNode.Parse(payload)?.AsObject();
|
||||||
if (root == null)
|
if (root == null)
|
||||||
|
|
@ -178,6 +180,13 @@ namespace OpenAuth.WebApi.Model.mqtt
|
||||||
uavsn = uavsn == "" ? "1581F8HGX254V00A0BUY" : uavsn;
|
uavsn = uavsn == "" ? "1581F8HGX254V00A0BUY" : uavsn;
|
||||||
_manageApp.AddDronePort(lasaDronePort);
|
_manageApp.AddDronePort(lasaDronePort);
|
||||||
_manageApp.AddLasaUav(lasaUav);
|
_manageApp.AddLasaUav(lasaUav);
|
||||||
|
var topics = new List<string>();
|
||||||
|
topics.AddRange(new[]
|
||||||
|
{
|
||||||
|
$"thing/product/{dronesn}/osd",
|
||||||
|
$"thing/product/{uavsn}/osd",
|
||||||
|
});
|
||||||
|
await _mqttCenter.SubscribeAsync(topics.ToArray());
|
||||||
var requestData = new
|
var requestData = new
|
||||||
{
|
{
|
||||||
bid = Guid.NewGuid().ToString(),
|
bid = Guid.NewGuid().ToString(),
|
||||||
|
|
|
||||||
|
|
@ -342,7 +342,7 @@ namespace OpenAuth.WebApi
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ConfigureContainer(ContainerBuilder builder)
|
public void ConfigureContainer(ContainerBuilder builder)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue