bugfix: 尝试解决计划任务不正常结束问题
parent
e8d8b0dc18
commit
44587effc9
|
|
@ -561,9 +561,7 @@ public class ConfigSubscribe : IJob
|
|||
}
|
||||
_logger.LogDebug("航线进度未跳过处理");
|
||||
code = data.result; // result
|
||||
|
||||
|
||||
|
||||
|
||||
var taskAssign1 = _manageApp.GetTaskAssignByFlightId(flightId1);
|
||||
// 处理航线进度 ,也有可能是失败
|
||||
if (code != 0)
|
||||
|
|
@ -603,39 +601,7 @@ public class ConfigSubscribe : IJob
|
|||
}
|
||||
else
|
||||
{
|
||||
var step = (int)data.output.progress.current_step;
|
||||
_logger.LogDebug($"航线进度:{waylineMissionState} {step} {message}");
|
||||
if (step.Equals(25)) // todo 关于会接收到不同消息问题,如何处理
|
||||
{
|
||||
var task = await _sqlSugarClient.Queryable<LasaTask>()
|
||||
.FirstAsync(y => y.Id == taskAssign1.TaskId);
|
||||
if (task != null && !string.IsNullOrEmpty(task.AIInspection) &&
|
||||
task.AIInspection.Equals("true") && string.IsNullOrEmpty(task.PushUrl))
|
||||
{
|
||||
_logger.LogDebug("执行AI 智能巡检。。。。。");
|
||||
//var rtmp = "rtmp://box.wisestcity.com:1935/live/7";
|
||||
var bid = Guid.NewGuid().ToString();
|
||||
var tid = Guid.NewGuid().ToString();
|
||||
var param = @$"{{
|
||||
""bid"": ""{bid}"",
|
||||
""method"": ""live_start_push"",
|
||||
""tid"": ""{tid}"",
|
||||
""timestamp"": {DateTimeOffset.Now.ToUnixTimeMilliseconds()},
|
||||
""data"": {{
|
||||
""url_type"": 1,
|
||||
""url"": ""{rtmp}"",
|
||||
""video_id"": ""1581F8HGX254V00A0BUY/99-0-0/normal-0"",
|
||||
""video_quality"": 3
|
||||
}}
|
||||
}}";
|
||||
_logger.LogDebug($"直播参数:{param}");
|
||||
var topicRequest = $"thing/product/{sn}/services";
|
||||
// 开启直播
|
||||
await _mqttClientManager.PublishAsync(topicRequest, param);
|
||||
liveInfo[$"{tid}{bid}"] = taskAssign1.TaskId;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 航线成功
|
||||
if (waylineMissionState.Equals(9)) // 航结结束,更新任务状态
|
||||
{
|
||||
|
|
@ -669,6 +635,39 @@ public class ConfigSubscribe : IJob
|
|||
};
|
||||
await _sqlSugarClient.Updateable(record).IgnoreNullColumns().ExecuteCommandAsync();
|
||||
}
|
||||
var step = (int)data.output.progress.current_step;
|
||||
_logger.LogDebug($"航线进度:{waylineMissionState} {step} {message}");
|
||||
if (step.Equals(25)) // todo 关于会接收到不同消息问题,如何处理
|
||||
{
|
||||
var task = await _sqlSugarClient.Queryable<LasaTask>()
|
||||
.FirstAsync(y => y.Id == taskAssign1.TaskId);
|
||||
if (task != null && !string.IsNullOrEmpty(task.AIInspection) &&
|
||||
task.AIInspection.Equals("true") && string.IsNullOrEmpty(task.PushUrl))
|
||||
{
|
||||
_logger.LogDebug("执行AI 智能巡检。。。。。");
|
||||
//var rtmp = "rtmp://box.wisestcity.com:1935/live/7";
|
||||
var bid = Guid.NewGuid().ToString();
|
||||
var tid = Guid.NewGuid().ToString();
|
||||
var param = @$"{{
|
||||
""bid"": ""{bid}"",
|
||||
""method"": ""live_start_push"",
|
||||
""tid"": ""{tid}"",
|
||||
""timestamp"": {DateTimeOffset.Now.ToUnixTimeMilliseconds()},
|
||||
""data"": {{
|
||||
""url_type"": 1,
|
||||
""url"": ""{rtmp}"",
|
||||
""video_id"": ""1581F8HGX254V00A0BUY/99-0-0/normal-0"",
|
||||
""video_quality"": 3
|
||||
}}
|
||||
}}";
|
||||
_logger.LogDebug($"直播参数:{param}");
|
||||
var topicRequest = $"thing/product/{sn}/services";
|
||||
// 开启直播
|
||||
await _mqttClientManager.PublishAsync(topicRequest, param);
|
||||
liveInfo[$"{tid}{bid}"] = taskAssign1.TaskId;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*if (result.need_reply.Equals(1))
|
||||
|
|
|
|||
Loading…
Reference in New Issue