1. 媒体库添加创建人

2. 手飞任务任务状态调整
main
陈伟 6 days ago
parent 7dfe5f83e2
commit e5026a8d38

@ -2369,6 +2369,7 @@ namespace OpenAuth.App.ServiceApp
/// <returns></returns>
public async Task<Response<dynamic>> SaveHandFlyTask(LasaHandFlyTask task)
{
var user = _auth.GetCurrentUser().User;
var date = DateTime.Now;
var lasaTask = new LasaTask
{
@ -2379,10 +2380,12 @@ namespace OpenAuth.App.ServiceApp
FlightTaskType = 1,
WorkspaceId = task.WorkspaceId,
FlightId = task.FlightId,
Status = 0, // 待执行
Status = 1, // 待执行
CreateTime = date,
ScheduledStartTime = date, // 任务计划执行时间
ExecuteTime = date // 任务开始执行时间
ExecuteTime = date, // 任务开始执行时间
CreateUserName = user.Name,
CreateId = user.Id
};
await Repository.ChangeRepository<SugarRepositiry<LasaTask>>().InsertAsync(lasaTask);
return new Response<dynamic>()

@ -217,10 +217,11 @@ public class ConfigSubscribe : IJob
var taskId = "";
var taskName = "";
var workspaceId = "";
LasaTask executeTask = null;
if (taskAssign != null)
{
taskId = taskAssign.TaskId;
var executeTask = await _sqlSugarClient
executeTask = await _sqlSugarClient
.Queryable<LasaTask>()
.SingleAsync(a => a.Id == taskId);
if (!string.IsNullOrEmpty(executeTask.TaskName))
@ -487,6 +488,11 @@ public class ConfigSubscribe : IJob
GimbalRollDegree = gimbalRoll,
DigitalZoomRatio = digitalZoomRatio
};
if (executeTask != null)
{
fileUpload.CreateUserName = executeTask.CreateUserName;
fileUpload.CreateUserId = executeTask.CreateId;
}
// 添加事务
await _sqlSugarClient.Insertable(fileUpload).ExecuteCommandAsync();
}
@ -574,6 +580,7 @@ public class ConfigSubscribe : IJob
_logger.LogInformation("跳过处理");
break;
}
_logger.LogDebug("航线进度未跳过处理");
code = data.result; // result
@ -644,7 +651,7 @@ public class ConfigSubscribe : IJob
_logger.LogDebug($"直播参数:{param}");
var topicRequest = $"thing/product/{sn}/services";
await _mqttClientManager.PublishAsync(topicRequest, param);
var req = new CallAiModel { TaskId = taskAssign1.TaskId ,RtmpUrl = rtmp};
var req = new CallAiModel { TaskId = taskAssign1.TaskId, RtmpUrl = rtmp };
await _manageApp.CallAiModel(req);
}
}
@ -727,6 +734,7 @@ public class ConfigSubscribe : IJob
{
break;
}
_logger.LogDebug($"开启直播成功 {message}");
break;
case "live_stop_push":

@ -134,16 +134,17 @@ public class LasaMediaFile
[SugarColumn(IsIgnore = true)] public string PicLink { get; set; }
public string minipic { get; set; }
public double? FocalLength { get; set; }
public string PayloadModelName { get; set; }
public int? Type { get; set; }
[SugarColumn(IsIgnore = true)] public List<LasaMediaFile> Children { get; set; }
[SugarColumn(IsIgnore = true)] public string CreateUserName { get; set; }
public string CreateUserName { get; set; }
[SugarColumn(IsIgnore = true)] public string TaskName { get; set; }
[SugarColumn(IsIgnore = true)] public string AirLineName { get; set; }
public long CreateUserId { get; set; }
}
Loading…
Cancel
Save