调整视频更新url字段,新增origin_video_url为原始视频,video_url为压缩视频

app/Console/Commands/CheckVideoGenerationTasksCommand.php

@@ -90,7 +90,7 @@ class CheckVideoGenerationTasksCommand extends Command
                 // 查询视频生成任务状态
                 $videoTask = DB::table('mp_generate_video_tasks')
                     ->where('id', $videoTaskId)
-                    ->select('id', 'status', 'result_url', 'last_frame_url', 'error_message', 'result_json', 'extra_params')
+                    ->select('id', 'status', 'result_url', 'compressed_url', 'last_frame_url', 'error_message', 'result_json', 'extra_params')
                     ->first();
 
                 if (!$videoTask) {
@@ -106,9 +106,8 @@ class CheckVideoGenerationTasksCommand extends Command
                 // 根据任务状态更新分镜表
                 if ($videoTask->status === 'success') {
                     $updateData['video_task_status'] = '已完成';
-                    $updateData['video_url'] = $videoTask->result_url;
-                    $compressed_video_url = compressVideo($updateData['video_url']);
-                    if ($compressed_video_url) $updateData['preview_video_url'] = $compressed_video_url;
+                    $updateData['origin_video_url'] = $videoTask->result_url;
+                    $updateData['video_url'] = $videoTask->compressed_url ?: $videoTask->result_url;
                     $updateData['current_type'] = 2;
                     
                     // 如果有尾帧图片，也更新

app/Http/Controllers/Anime/AnimeController.php

@@ -475,14 +475,14 @@ class AnimeController extends BaseController
                                     
                                     // 更新分镜表
                                     $segmentUpdateData = [
-                                        'video_url' => $statusResult['result_url'],
+                                        'origin_video_url' => $statusResult['result_url'],
                                         'video_task_status' => '已完成',
                                         'last_frame_url' => $statusResult['last_frame_url'] ?? '',
                                         'current_type' => 2,
                                         'updated_at' => $now
                                     ];
-                                    $compressed_video_url = compressVideo($segmentUpdateData['video_url']);
-                                    if ($compressed_video_url) $segmentUpdateData['preview_video_url'] = $compressed_video_url;
+                                    $compressed_video_url = compressVideo($statusResult['result_url']);
+                                    $segmentUpdateData['video_url'] = $compressed_video_url ?: $statusResult['result_url'];
                                     
                                     // 只有当video_duration存在且大于0时才更新
                                     if (isset($statusResult['video_duration']) && $statusResult['video_duration'] > 0) {
@@ -576,7 +576,8 @@ class AnimeController extends BaseController
                             'data' => [
                                 'task_id' => $task->id,
                                 'status' => $task->status,
-                                'video_url' => $task->result_url,
+                                'video_url' => $task->compressed_url ?: $task->result_url,
+                                'origin_video_url' => $task->result_url,
                                 'last_frame_url' => $task->last_frame_url,
                                 'error_message' => $task->error_message
                             ]
@@ -933,14 +934,14 @@ class AnimeController extends BaseController
                                         if ($segmentId) {
                                             // 更新分镜表
                                             $segmentUpdateData = [
-                                                'video_url' => $statusResult['result_url'],
+                                                'origin_video_url' => $statusResult['result_url'],
                                                 'video_task_status' => '已完成',
                                                 'last_frame_url' => $statusResult['last_frame_url'] ?? '',
                                                 'current_type' => 2,
                                                 'updated_at' => $now
                                             ];
-                                            $compressed_video_url = compressVideo($segmentUpdateData['video_url']);
-                                            if ($compressed_video_url) $segmentUpdateData['preview_video_url'] = $compressed_video_url;
+                                            $compressed_video_url = compressVideo($statusResult['result_url']);
+                                            $segmentUpdateData['video_url'] = $compressed_video_url ?: $statusResult['result_url'];
                                             
                                             // 只有当video_duration存在且大于0时才更新
                                             if (isset($statusResult['video_duration']) && $statusResult['video_duration'] > 0) {
@@ -1574,24 +1575,6 @@ class AnimeController extends BaseController
             ->orderBy('segment_number')
             ->get();
 
-        if (env('APP_ENV') == 'production') {   // 正式环境才压缩
-            // 循环判断分镜中preview_video_url是否存在，如果没有但video_url有值，则压缩video_url并赋值给preview_video_url
-            foreach ($segments as $segment) {
-                $segment = (array)$segment;
-                if ((empty($segment['preview_video_url']) || $segment['preview_video_url'] === '') 
-                    && !empty($segment['video_url']) && $segment['video_url'] !== '') {
-                    // 压缩视频
-                    $compressedUrl = compressVideo($segment['video_url'], 'videos');
-                    
-                    // 只有压缩成功才更新数据库
-                    if ($compressedUrl !== '') {
-                        DB::table('mp_episode_segments')
-                            ->where('id', $segment['id'])
-                            ->update(['preview_video_url' => $compressedUrl]);
-                    }
-                }
-            }
-        }
 
         // 判断是否有未完成的任务
         $uncompleted_pic_count = DB::table('mp_episode_segments')->where('anime_id', $animeId)

app/Models/MpGenerateVideoTask.php

@@ -23,6 +23,7 @@ class MpGenerateVideoTask extends Model
         'frames',
         'status',
         'result_url',
+        'compressed_url',
         'error_message',
         'extra_params',
         'started_at',
@@ -56,6 +57,10 @@ class MpGenerateVideoTask extends Model
             $updateData['result_url'] = $data['result_url'];
         }
         
+        if (isset($data['compressed_url'])) {
+            $updateData['compressed_url'] = $data['compressed_url'];
+        }
+        
         if (isset($data['last_frame_url'])) {
             $updateData['last_frame_url'] = $data['last_frame_url'];
         }

app/Services/AIGeneration/AIVideoGenerationService.php

@@ -330,14 +330,14 @@ class AIVideoGenerationService
                     
                     // 构建更新数据
                     $segmentUpdateData = [
-                        'video_url' => $statusInfo['result_url'],
+                        'origin_video_url' => $statusInfo['result_url'],
                         'video_task_status' => '已完成',
                         'current_type' => 2,
                         'last_frame_url' => $statusInfo['last_frame_url'] ?? '',
                         'updated_at' => $now
                     ];
-                    $compressed_video_url = compressVideo($segmentUpdateData['video_url']);
-                    if ($compressed_video_url) $segmentUpdateData['preview_video_url'] = $compressed_video_url;
+                    $compressed_video_url = compressVideo($statusInfo['result_url']);
+                    $segmentUpdateData['video_url'] = $compressed_video_url ?: $statusInfo['result_url'];
                     
                     // 只有当video_duration存在且大于0时才更新
                     if (isset($statusInfo['video_duration']) && $statusInfo['video_duration'] > 0) {
@@ -594,14 +594,14 @@ class AIVideoGenerationService
                     
                     // 构建更新数据
                     $segmentUpdateData = [
-                        'video_url' => $statusInfo['result_url'],
+                        'origin_video_url' => $statusInfo['result_url'],
                         'video_task_status' => '已完成',
                         'current_type' => 2,
                         'last_frame_url' => $statusInfo['last_frame_url'] ?? '',
                         'updated_at' => $now
                     ];
-                    $compressed_video_url = compressVideo($segmentUpdateData['video_url']);
-                    if ($compressed_video_url) $segmentUpdateData['preview_video_url'] = $compressed_video_url;
+                    $compressed_video_url = compressVideo($statusInfo['result_url']);
+                    $segmentUpdateData['video_url'] = $compressed_video_url ?: $statusInfo['result_url'];
                     
                     // 只有当video_duration存在且大于0时才更新
                     if (isset($statusInfo['video_duration']) && $statusInfo['video_duration'] > 0) {
@@ -744,6 +744,10 @@ class AIVideoGenerationService
                     $video_name = $video_name . $video_ext;
                     $url = uploadStreamByTos('video', file_get_contents($video_url), $video_name);
                     $updateData['result_url'] = $url;
+                    
+                    // 压缩视频
+                    $compressed_video_url = compressVideo($url);
+                    $updateData['compressed_url'] = $compressed_video_url ?: $url;
                 }
                 
                 // 计算视频时长
@@ -888,8 +892,8 @@ class AIVideoGenerationService
                         $video_name = $video_name . $video_ext;
                         $url = uploadStreamByTos('video', file_get_contents($video_url), $video_name);
                         $updateData['result_url'] = $url;
-                        $compressed_video_url = compressVideo($updateData['result_url']);
-                        if ($compressed_video_url) $updateData['preview_video_url'] = $compressed_video_url;
+                        $compressed_video_url = compressVideo($url);
+                        $updateData['compressed_url'] = $compressed_video_url ?: $url;
                         
                         dLog('generate')->info('Seedance 视频保存成功: ' . $url);
                     } catch (\Exception $e) {
@@ -990,10 +994,13 @@ class AIVideoGenerationService
             if ($taskStatus === MpGenerateVideoTask::STATUS_SUCCESS) {
                 $segmentUpdateData['video_task_status'] = '已完成';
                 if (isset($updateData['result_url'])) {
-                    $segmentUpdateData['video_url'] = $updateData['result_url'];
-                }
-                if (isset($updateData['preview_video_url'])) {
-                    $segmentUpdateData['preview_video_url'] = $updateData['preview_video_url'];
+                    $segmentUpdateData['origin_video_url'] = $updateData['result_url'];
+                    // 如果有压缩视频URL，使用压缩后的
+                    if (isset($updateData['compressed_url'])) {
+                        $segmentUpdateData['video_url'] = $updateData['compressed_url'];
+                    } else {
+                        $segmentUpdateData['video_url'] = $updateData['result_url'];
+                    }
                 }
             } elseif ($taskStatus === MpGenerateVideoTask::STATUS_FAILED) {
                 $segmentUpdateData['video_task_status'] = '失败';
@@ -1379,14 +1386,14 @@ class AIVideoGenerationService
                     
                     // 构建更新数据
                     $segmentUpdateData = [
-                        'video_url' => $statusInfo['result_url'],
+                        'origin_video_url' => $statusInfo['result_url'],
                         'video_task_status' => '已完成',
                         'current_type' => 2,
                         'last_frame_url' => $statusInfo['last_frame_url'] ?? '',
                         'updated_at' => $now
                     ];
-                    $compressed_video_url = compressVideo($segmentUpdateData['video_url']);
-                    if ($compressed_video_url) $segmentUpdateData['preview_video_url'] = $compressed_video_url;
+                    $compressed_video_url = compressVideo($statusInfo['result_url']);
+                    $segmentUpdateData['video_url'] = $compressed_video_url ?: $statusInfo['result_url'];
                     
                     // 只有当video_duration存在且大于0时才更新
                     if (isset($statusInfo['video_duration']) && $statusInfo['video_duration'] > 0) {

app/Services/Anime/AnimeService.php

@@ -103,7 +103,6 @@ class AnimeService
                 'video_duration' => getProp($segment, 'video_duration', 0),
                 'video_time_point_start' => getProp($segment, 'video_time_point_start', 0),
                 'video_time_point_end' => getProp($segment, 'video_time_point_end', getProp($segment, 'video_duration', 0)),
-                'preview_video_url' => getProp($segment, 'preview_video_url'),
                 'last_frame_url' => getProp($segment, 'last_frame_url'),
                 'current_type' => getProp($segment, 'current_type'),
             ];
@@ -841,15 +840,11 @@ class AnimeService
 
         if (!$segment_id) Utils::throwError('20003:请选择分镜!');
 
-        // 获取当前预览视频
-        $preview_video_url = DB::table('mp_episode_segments')->where('segment_id', $segment_id)->value('preview_video_url');
-        if (!$preview_video_url) $preview_video_url = '';
         $query = DB::table('mp_anime_records')->where('segment_id', $segment_id)->select('role', 'content', 'segment_id', 'image_url', 'video_url', 'created_at');
         
-        $chat = $query->orderBy('id')->get()->map(function ($value) use ($preview_video_url) {
+        $chat = $query->orderBy('id')->get()->map(function ($value) {
             $value = (array)$value;
             $value['created_at'] = transDate($value['created_at']);
-            $value['preview_video_url'] = $preview_video_url;
             return $value;
         })->toArray();
 
@@ -1072,16 +1067,16 @@ class AnimeService
             }
 
             if ($video_url) {
-                $update_data['video_url'] = $video_url;
+                $update_data['origin_video_url'] = $video_url;
                 $compressed_video_url = compressVideo($video_url);
                 $update_data['current_type'] = 2;
-                if ($compressed_video_url) $update_data['preview_video_url'] = $compressed_video_url;
+                $update_data['video_url'] = $compressed_video_url ?: $video_url;
 
                 // 同时写入一个简单的视频生成任务
                 $video_task = [
                     'alias_segment_id'  => $segment_id,
                     'status' => 'success',
-                    'result_url' => $video_url,
+                    'result_url' => $update_data['video_url'],
                     'created_at' => date('Y-m-d H:i:s'),
                     'updated_at' => date('Y-m-d H:i:s'),
                 ];
@@ -1705,10 +1700,10 @@ class AnimeService
 
         if ($img_url) $insert_data['img_url'] = $img_url;
         if ($video_url) {
-            $insert_data['video_url'] = $video_url;
+            $insert_data['origin_video_url'] = $video_url;
             $insert_data['current_type'] = 2;
             $compressed_video_url = compressVideo($video_url);
-            if ($compressed_video_url) $insert_data['preview_video_url'] = $compressed_video_url;
+            $insert_data['video_url'] = $compressed_video_url ?: $video_url;
         }
 
         try {