HC_YFZX
/
LASAPlatform
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改提示

main
zhangbin 2025-12-01 09:54:00 +08:00
parent 8f59c74772
commit e49300de2d
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs
View File

@ -557,7 +557,7 @@ namespace OpenAuth.App.ServiceApp
#region 天气阻飞
//天气预报和是否有人在操作
public async Task<Response<bool>> IsCanFly(string sn, string dock, string address = "兰山")
public async Task<Response<string>> IsCanFly(string sn, string dock, string address = "兰山")
{
var rainThreshforecast = 3; // 天气预报雨量
var windSpeedThresh = 12;// 机场设定雨量
@ -567,7 +567,7 @@ namespace OpenAuth.App.ServiceApp
var existingLocked = await _redisCacheContext.SetMembersAsync("locked_devices");
islock = existingLocked.Any(u => u == sn);
if (islock)
return new Response<bool> { Result = false, Message = "设备已锁定" };
return new Response<string> { Code = 500, Result = "设备已锁定", Message = "设备已锁定" };
switch (dock)
{
case "Dock 1":
@ -604,17 +604,17 @@ namespace OpenAuth.App.ServiceApp
var rainfall = dataObject["data"]?["rainfall"]?.Value<int>();
var drone_in_dock = dataObject["data"]?["drone_in_dock"]?.Value<string>();
if (drone_in_dock == "0")
return new Response<bool> { Result = false, Message = "执行任务中，请勿重复起飞" };
return new Response<string> { Code = 500, Result = "执行任务中，请勿重复起飞" };
if (windSpeedThresh <= windSpeed || rainThreshforecast <= rainfall || weatherWindSpeedThre <= weatherWindSpeedforecast)
{
return new Response<bool> { Result = false, Message = "当前天气条件不允许起飞" };
return new Response<string> { Code = 500, Result = "当前天气条件不允许起飞" };
}
else
{
return new Response<bool> { Result = true, Message = "当前天气条件允许起飞" };
return new Response<string> { Code = 200, Result = "当前天气条件允许起飞" };
}
}
return new Response<bool> { Result = true, Message = "当前天气条件允许起飞" };
return new Response<string> { Code = 500, Result = "当前天气条件允许起飞" };
}
#endregion

4
OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs
View File

@ -748,9 +748,9 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<Response<bool>> IsCanFly(string address, string sn, string dock)
public async Task<Response<string>> IsCanFly(string address, string sn, string dock)
{
var result = new Response<bool>();
var result = new Response<string>();
try
{
result = await _app.IsCanFly(sn, dock, address);

9
OpenAuth.WebApi/Model/mqtt/ThingOperationHandler.cs
View File

@ -1,5 +1,6 @@
using Infrastructure.Cache;
using Infrastructure.CloudSdk.mqttmessagecenter;
using Newtonsoft.Json;
using OpenAuth.App.ServiceApp;
using OpenAuth.Repository.Domain;
using System.Text.Json.Nodes;
@ -22,6 +23,11 @@ namespace OpenAuth.WebApi.Model.mqtt
public async Task HandleAsync(string topic, string payload)
{
var root = JsonNode.Parse(payload)?.AsObject();
string dataJson = JsonConvert.SerializeObject(root["Data"],new JsonSerializerSettings
{
StringEscapeHandling = StringEscapeHandling.Default
});
await _app.AddOperationLog(new LasaControlOperation
{
Id = Guid.NewGuid().ToString(),
@ -29,7 +35,8 @@ namespace OpenAuth.WebApi.Model.mqtt
TaskId = root["TaskId"]?.ToString() ?? "",
CreateTime = DateTime.Now,
CreateId = long.Parse((root["CreateId"]?.ToString() ?? "0")),
Data = root["Data"]?.ToJsonString() ?? ""
//Data = root["Data"]?.ToJsonString() ?? ""
Data = dataJson
});
//var info = Newtonsoft.Json.JsonConvert.DeserializeObject<LasaControlOperation>(payload);
//info.Id = Guid.NewGuid().ToString();