Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/LASAPlatform
commit
504c3af0ad
|
|
@ -2868,18 +2868,18 @@ namespace OpenAuth.App.ServiceApp
|
|||
return string.Concat(input.Where(c => !charsToRemove.Contains(c)));
|
||||
}
|
||||
|
||||
public async Task<Response<dynamic>> GetLastHandFlyTask()
|
||||
public async Task<Response<dynamic>> GetLastHandFlyTask(string sn)
|
||||
{
|
||||
var result = await Repository.ChangeRepository<SugarRepositiry<LasaTask>>()
|
||||
.AsQueryable()
|
||||
.LeftJoin<LasaDronePort>((r, p) => r.TaskDronePort == p.Id)
|
||||
.Where(r => r.FlightTaskType == 1)
|
||||
.Where((r, p) => p.Sn == sn)
|
||||
.OrderByDescending(r => r.CreateTime)
|
||||
.Select<dynamic>((r, p) => new
|
||||
{
|
||||
r.Id,
|
||||
r.Status,
|
||||
p.Sn
|
||||
r.Status
|
||||
})
|
||||
.FirstAsync();
|
||||
return new Response<dynamic>
|
||||
|
|
|
|||
|
|
@ -947,9 +947,9 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
|
|||
}
|
||||
|
||||
[HttpGet]
|
||||
public async Task<Response<dynamic>> GetLastHandFlyTask()
|
||||
public async Task<Response<dynamic>> GetLastHandFlyTask(string sn)
|
||||
{
|
||||
return await _app.GetLastHandFlyTask();
|
||||
return await _app.GetLastHandFlyTask(sn);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Reference in New Issue