bugfix:系统运行期间添加任务不运行问题
parent
af38aebe66
commit
14bab088de
|
|
@ -72,7 +72,7 @@ namespace OpenAuth.App
|
|||
_logger.LogInformation("所有状态为正在运行的任务已启动");
|
||||
}
|
||||
|
||||
public void Add(AddOrUpdateOpenJobReq req)
|
||||
public string Add(AddOrUpdateOpenJobReq req)
|
||||
{
|
||||
var obj = req.MapTo<SysOpenJob>();
|
||||
obj.Id = Guid.NewGuid().ToString();
|
||||
|
|
@ -81,6 +81,7 @@ namespace OpenAuth.App
|
|||
obj.CreateUserId = user.Id.ToString();
|
||||
obj.CreateUserName = user.Name;
|
||||
Repository.Insert(obj);
|
||||
return obj.Id;
|
||||
}
|
||||
|
||||
public void AddStart(AddOrUpdateOpenJobReq req)
|
||||
|
|
@ -131,6 +132,16 @@ namespace OpenAuth.App
|
|||
return types.Select(u => u.FullName).ToList();
|
||||
}
|
||||
|
||||
public void StartJob(string jobId)
|
||||
{
|
||||
var job = Repository.GetFirst(u => u.Id == jobId);
|
||||
if (job == null)
|
||||
{
|
||||
throw new Exception("任务不存在");
|
||||
}
|
||||
job.Start(_scheduler);
|
||||
}
|
||||
|
||||
public void ChangeJobStatus(ChangeJobStatusReq req)
|
||||
{
|
||||
var job = Repository.GetFirst(u => u.Id == req.Id);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ public class FlyTaskJob : IJob
|
|||
if (job == null) return Task.CompletedTask;
|
||||
var param = JsonConvert.DeserializeObject<dynamic>(job.JobCallParams);
|
||||
var taskId = (string)param.taskId;
|
||||
_manageApp.ExecuteFlyTask(taskId);
|
||||
_ = _manageApp.ExecuteFlyTask(taskId);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
|
@ -238,7 +238,7 @@ namespace OpenAuth.App.ServiceApp
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取机场sn获取无人机列表
|
||||
/// </summary>
|
||||
|
|
@ -397,7 +397,6 @@ namespace OpenAuth.App.ServiceApp
|
|||
task.CreateUserName = user.Name;
|
||||
task.CreateTime = DateTime.Now;
|
||||
//task.FlightId = Guid.NewGuid().ToString();
|
||||
// todo 根据
|
||||
// 如:执行时长,单次定时的时间
|
||||
// 0-飞行计划 1-指点飞行
|
||||
task.FlightTaskType = 0; //
|
||||
|
|
@ -416,7 +415,8 @@ namespace OpenAuth.App.ServiceApp
|
|||
Status = 1, // 开启运行 todo 关于修改后关闭问题
|
||||
Remark = "定时任务",
|
||||
};
|
||||
_openJobApp.Add(record);
|
||||
var jobId = _openJobApp.Add(record);
|
||||
_openJobApp.StartJob(jobId);
|
||||
}
|
||||
else if (type.Equals(0))
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue