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

Merge remote-tracking branch 'origin/main'

main
陈伟 2025-12-11 17:00:08 +08:00
parent eac723fee7 7721e4c616
commit 9820be5ead
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,7 +581,7 @@ namespace OpenAuth.App.ServiceApp
};
}
//天气预报和是否有人在操作
public async Task<Response<dynamic>> IsCanFly(string sn, string dock, string address = "兰山")
public async Task<Response<dynamic>> IsCanFly(string userid, string sn, string dock, string address = "兰山")
{
var rainThreshforecast = 3; // 天气预报雨量
var windSpeedThresh = 12;// 机场设定雨量
@ -592,7 +592,7 @@ namespace OpenAuth.App.ServiceApp
islock = existingLocked.Any(u => u == sn);
//查找被谁锁定
var entries = ParseClient(await _redisCacheContext.HashGetAllAsync($"client:{sn}"));
if (islock)
if (islock && entries.UserId != userid)
return new Response<dynamic> { Result = new { status = false, msg = "设备已被" + entries?.UserName + "锁定" } };
switch (dock)
{

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

@ -841,12 +841,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<Response<dynamic>> IsCanFly(string address, string sn, string dock)
public async Task<Response<dynamic>> IsCanFly(string userid, string address, string sn, string dock)
{
var result = new Response<dynamic>();
try
{
result = await _app.IsCanFly(sn, dock, address);
result = await _app.IsCanFly(userid, sn, dock, address);
}
catch (Exception ex)
{