|
|
|
@ -5,6 +5,7 @@ using Infrastructure;
|
|
|
|
|
using Infrastructure.CloudSdk.minio;
|
|
|
|
|
using Infrastructure.CloudSdk.wayline;
|
|
|
|
|
using Microsoft.AspNetCore.Http;
|
|
|
|
|
using Microsoft.IdentityModel.Tokens;
|
|
|
|
|
using Newtonsoft.Json;
|
|
|
|
|
using Newtonsoft.Json.Linq;
|
|
|
|
|
using OpenAuth.App.BaseApp.Base;
|
|
|
|
@ -389,6 +390,9 @@ namespace OpenAuth.App.ServiceApp
|
|
|
|
|
//添加任务
|
|
|
|
|
public async Task<Response<bool>> AddTask(LasaTask task)
|
|
|
|
|
{
|
|
|
|
|
var airLine = await Repository
|
|
|
|
|
.ChangeRepository<SugarRepositiry<LasaAirLine>>()
|
|
|
|
|
.GetByIdAsync(task.AirLineId);
|
|
|
|
|
using (var db = UnitWork.CreateContext())
|
|
|
|
|
{
|
|
|
|
|
var user = _auth.GetCurrentUser().User;
|
|
|
|
@ -400,11 +404,17 @@ namespace OpenAuth.App.ServiceApp
|
|
|
|
|
// 如:执行时长,单次定时的时间
|
|
|
|
|
// 0-飞行计划 1-指点飞行
|
|
|
|
|
task.FlightTaskType = 0; //
|
|
|
|
|
task.PlanExecuteDuration = airLine.ScheduleTime;
|
|
|
|
|
task.ExpectedFileCount = airLine.PictureTotal;
|
|
|
|
|
var flag = await db.LasaTask.InsertAsync(task);
|
|
|
|
|
// //{"0":"立即任务","1":"定时任务",
|
|
|
|
|
var type = task.TaskType;
|
|
|
|
|
if (type.Equals(1)) // 定时任务
|
|
|
|
|
{
|
|
|
|
|
// 0 0 10 23 7 ? 2025
|
|
|
|
|
// 计算执行时间
|
|
|
|
|
//task.ScheduledStartTime = DateTime.Now;
|
|
|
|
|
//task.ScheduledEndTime = DateTime.Now.AddHours(1);
|
|
|
|
|
AddOrUpdateOpenJobReq record = new AddOrUpdateOpenJobReq()
|
|
|
|
|
{
|
|
|
|
|
JobName = $"{task.Id}",
|
|
|
|
@ -420,6 +430,10 @@ namespace OpenAuth.App.ServiceApp
|
|
|
|
|
}
|
|
|
|
|
else if (type.Equals(0))
|
|
|
|
|
{
|
|
|
|
|
var x = DateTime.Now;
|
|
|
|
|
// 计算执行时间
|
|
|
|
|
task.ScheduledStartTime = x;
|
|
|
|
|
task.ScheduledEndTime = x.AddMilliseconds(task.PlanExecuteDuration);
|
|
|
|
|
// 调用飞行任务
|
|
|
|
|
await ExecuteFlyTask(task.Id);
|
|
|
|
|
}
|
|
|
|
@ -839,7 +853,7 @@ namespace OpenAuth.App.ServiceApp
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public async Task ExecuteFlyTask(string taskId)
|
|
|
|
|
{
|
|
|
|
|
// 任务信息
|
|
|
|
|