|
|
|
@ -214,10 +214,7 @@ public class ConfigSubscribe : IJob
|
|
|
|
|
string flightId = data.file.ext.flight_id;
|
|
|
|
|
var taskAssgin = _manageApp.GetTaskAssignByFlightId(flightId);
|
|
|
|
|
var taskId = taskAssgin.TaskId;
|
|
|
|
|
// 54773919-3660-499f-b5e1-569524eba696/
|
|
|
|
|
// 9fc46343-1f6e-45ff-a832-952b30df882b/
|
|
|
|
|
// DJI_202507140923_002_9fc46343-1f6e-45ff-a832-952b30df882b/
|
|
|
|
|
// DJI_20250714092650_0087_V.jpeg
|
|
|
|
|
string objectKey = data.file.object_key;
|
|
|
|
|
var folderKey = ((string)data.file.object_key).Split("/");
|
|
|
|
|
var parentKey = folderKey[^2];
|
|
|
|
|
var isExist = await _sqlSugarClient
|
|
|
|
@ -261,31 +258,39 @@ public class ConfigSubscribe : IJob
|
|
|
|
|
parents.Add(parent1);
|
|
|
|
|
await _sqlSugarClient.Insertable(parents).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
// todo 重复检测
|
|
|
|
|
|
|
|
|
|
var fileUpload = new LasaMediaFile()
|
|
|
|
|
|
|
|
|
|
// 重复检测
|
|
|
|
|
var mediaFile = await _sqlSugarClient
|
|
|
|
|
.Queryable<LasaMediaFile>()
|
|
|
|
|
.Where(a => a.FlightId.Equals(flightId))
|
|
|
|
|
.Where(a => a.ObjectKey.Equals(objectKey)).SingleAsync();
|
|
|
|
|
if (mediaFile == null)
|
|
|
|
|
{
|
|
|
|
|
Id = Guid.NewGuid().ToString(),
|
|
|
|
|
FlightId = flightId, // 计划id
|
|
|
|
|
TaskId = taskAssgin.TaskId, // 任务id
|
|
|
|
|
DroneModelKey = data.file.ext.drone_model_key, // 无人机型号
|
|
|
|
|
IsOriginal = data.file.ext.is_original,
|
|
|
|
|
MediaIndex = data.file.ext.media_index,
|
|
|
|
|
PayloadModelKey = data.file.ext.payload_model_key, //这应该可以标明是什么设置
|
|
|
|
|
AbsoluteAltitude = data.file.metadata.absolute_altitude, // 拍摄绝对高度
|
|
|
|
|
GimbalYawDegree = data.file.metadata.gimbal_yaw_degree, //云台偏航角度
|
|
|
|
|
RelativeAltitude = data.file.metadata.relative_altitude, // 拍摄相对高度
|
|
|
|
|
Lat = data.file.metadata.shoot_position.lat,
|
|
|
|
|
Lng = data.file.metadata.shoot_position.lng,
|
|
|
|
|
Name = data.file.name,
|
|
|
|
|
ObjectKey = data.file.object_key,
|
|
|
|
|
Path = data.file.path, // 目前这个好像没有值
|
|
|
|
|
CreateTime = ((string)data.file.metadata.created_time).ToDateTime(),
|
|
|
|
|
ParentKey = folderKey[2],
|
|
|
|
|
Level = 4
|
|
|
|
|
};
|
|
|
|
|
// todo 添加事务
|
|
|
|
|
await _sqlSugarClient.Insertable(fileUpload).ExecuteCommandAsync();
|
|
|
|
|
var fileUpload = new LasaMediaFile()
|
|
|
|
|
{
|
|
|
|
|
Id = Guid.NewGuid().ToString(),
|
|
|
|
|
FlightId = flightId, // 计划id
|
|
|
|
|
TaskId = taskAssgin.TaskId, // 任务id
|
|
|
|
|
DroneModelKey = data.file.ext.drone_model_key, // 无人机型号
|
|
|
|
|
IsOriginal = data.file.ext.is_original,
|
|
|
|
|
MediaIndex = data.file.ext.media_index,
|
|
|
|
|
PayloadModelKey = data.file.ext.payload_model_key, //这应该可以标明是什么设置
|
|
|
|
|
AbsoluteAltitude = data.file.metadata.absolute_altitude, // 拍摄绝对高度
|
|
|
|
|
GimbalYawDegree = data.file.metadata.gimbal_yaw_degree, //云台偏航角度
|
|
|
|
|
RelativeAltitude = data.file.metadata.relative_altitude, // 拍摄相对高度
|
|
|
|
|
Lat = data.file.metadata.shoot_position.lat,
|
|
|
|
|
Lng = data.file.metadata.shoot_position.lng,
|
|
|
|
|
Name = data.file.name,
|
|
|
|
|
ObjectKey = data.file.object_key,
|
|
|
|
|
Path = data.file.path, // 目前这个好像没有值
|
|
|
|
|
CreateTime = ((string)data.file.metadata.created_time).ToDateTime(),
|
|
|
|
|
ParentKey = folderKey[2],
|
|
|
|
|
Level = 4
|
|
|
|
|
};
|
|
|
|
|
// todo 添加事务
|
|
|
|
|
await _sqlSugarClient.Insertable(fileUpload).ExecuteCommandAsync();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (result.need_reply.Equals(1))
|
|
|
|
|
{
|
|
|
|
|
var fileUploadCallbackEventReply = new FileUploadCallbackEventReply<object>()
|
|
|
|
|