diff --git a/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs b/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs index caa9a2b..1fc594c 100644 --- a/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs +++ b/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs @@ -332,20 +332,14 @@ public class ConfigSubscribe : IJob var y = response.Content.ReadAsByteArrayAsync().Result; var ms = new MemoryStream(y); var directories = ImageMetadataReader.ReadMetadata(ms); - // 获取 XMP 目录(包含 XMP 原始 XML 数据) var xmpDirectory = directories.OfType().FirstOrDefault(); if (xmpDirectory != null) { - // 获取 XMP 的 XML 字符串(原始数据) var xmpXml = xmpDirectory.GetXmpProperties(); foreach (var keyValuePair in xmpXml) { switch (keyValuePair.Key) { - // // drone-dji:GimbalPitchDegree: -90.00 - //drone-dji:GimbalReverse: 0 - //drone-dji:GimbalRollDegree: +180.00 - //drone-dji:GimbalYawDegree: -96.40 case "drone-dji:GimbalPitchDegree": gimbalPitch = float.Parse(keyValuePair.Value); break; @@ -490,8 +484,16 @@ public class ConfigSubscribe : IJob }; if (executeTask != null) { - fileUpload.CreateUserName = executeTask.CreateUserName; - fileUpload.CreateUserId = executeTask.CreateId; + _logger.LogDebug($"任务信息:{JsonConvert.SerializeObject(executeTask)}"); + if (!string.IsNullOrEmpty(executeTask.CreateUserName)) + { + fileUpload.CreateUserName = executeTask.CreateUserName; + } + + if (executeTask.CreateId != null) + { + fileUpload.CreateUserId = executeTask.CreateId; + } } // 添加事务 @@ -665,8 +667,7 @@ public class ConfigSubscribe : IJob if (!string.IsNullOrEmpty(task.AIInspection) && task.AIInspection.Equals(true) && !string.IsNullOrEmpty(task.PushUrl)) { - // 停止直播 - // 停止 aimodel 运行 + // todo video_id 需要根据不同设备改变 var para = @$"{{ ""bid"": {Guid.NewGuid().ToString()}, ""data"": {{ diff --git a/OpenAuth.Repository/Domain/LasaMediaFile.cs b/OpenAuth.Repository/Domain/LasaMediaFile.cs index da3c4a5..7d74ef4 100644 --- a/OpenAuth.Repository/Domain/LasaMediaFile.cs +++ b/OpenAuth.Repository/Domain/LasaMediaFile.cs @@ -146,5 +146,5 @@ public class LasaMediaFile 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; } + public long? CreateUserId { get; set; } } \ No newline at end of file diff --git a/OpenAuth.Repository/Domain/LasaTask.cs b/OpenAuth.Repository/Domain/LasaTask.cs index 68fe28b..73f9f2a 100644 --- a/OpenAuth.Repository/Domain/LasaTask.cs +++ b/OpenAuth.Repository/Domain/LasaTask.cs @@ -81,7 +81,7 @@ namespace OpenAuth.Repository.Domain /// public string AirLineId { get; set; } - public long CreateId { get; set; } + public long? CreateId { get; set; } public DateTime? CreateTime { get; set; } ///