From b8d1fefa0d112400c7b18bf7b572f804d207d11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ACT=E4=B8=B6=E6=B5=81=E6=98=9F=E9=9B=A8?= <1340145680@qq.com> Date: Wed, 1 Apr 2026 17:55:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=9F=E6=88=90=E8=A7=86?= =?UTF-8?q?=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/initDB.ts | 1 + src/router.ts | 212 +++++++++--------- .../production/workbench/generateVideo.ts | 36 ++- .../production/workbench/getGenerateData.ts | 17 +- .../production/workbench/selectVideo.ts | 21 ++ src/types/database.d.ts | 21 +- 6 files changed, 165 insertions(+), 143 deletions(-) create mode 100644 src/routes/production/workbench/selectVideo.ts diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index 83aca7c..fa16fd6 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -539,6 +539,7 @@ description: 专注于从剧本内容中提取所使用的资产（角色、场 table.text("state"); table.text("reason"); table.text("prompt"); + table.integer("selectVideoId"); table.primary(["id"]); table.unique(["id"]); }, diff --git a/src/router.ts b/src/router.ts index 16f9586..5122a81 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 74dea22f03cd475b3b00fd48e38fd9df +// @routes-hash 44a93adb5c8e47f025e5e1ed15f8645d import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -76,58 +76,59 @@ import route72 from "./routes/production/workbench/generateVideoPrompt"; import route73 from "./routes/production/workbench/getGenerateData"; import route74 from "./routes/production/workbench/getVideoList"; import route75 from "./routes/production/workbench/getVideoModelDetail"; -import route76 from "./routes/project/addProject"; -import route77 from "./routes/project/addVisual"; -import route78 from "./routes/project/addVisualManual"; -import route79 from "./routes/project/deleteVisualManual"; -import route80 from "./routes/project/delProject"; -import route81 from "./routes/project/editProject"; -import route82 from "./routes/project/editVisualManual"; -import route83 from "./routes/project/getProject"; -import route84 from "./routes/project/getVisualManual"; -import route85 from "./routes/project/visualManual"; -import route86 from "./routes/script/addScript"; -import route87 from "./routes/script/delScript"; -import route88 from "./routes/script/exportScript"; -import route89 from "./routes/script/extractAssets"; -import route90 from "./routes/script/getScrptApi"; -import route91 from "./routes/script/pollScriptAssets"; -import route92 from "./routes/script/updateScript"; -import route93 from "./routes/scriptAgent/getPlanData"; -import route94 from "./routes/scriptAgent/setPlanData"; -import route95 from "./routes/scriptAgent/updateData"; -import route96 from "./routes/setting/about/checkUpdate"; -import route97 from "./routes/setting/about/downloadApp"; -import route98 from "./routes/setting/agentDeploy/agentSetKey"; -import route99 from "./routes/setting/agentDeploy/deployAgentModel"; -import route100 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route101 from "./routes/setting/dbConfig/clearData"; -import route102 from "./routes/setting/dev/getSwitchAiDevTool"; -import route103 from "./routes/setting/dev/updateSwitchAiDevTool"; -import route104 from "./routes/setting/fileManagement/openFolder"; -import route105 from "./routes/setting/getTextModel"; -import route106 from "./routes/setting/loginConfig/getUser"; -import route107 from "./routes/setting/loginConfig/updateUserPwd"; -import route108 from "./routes/setting/memoryConfig/delAllMemory"; -import route109 from "./routes/setting/memoryConfig/getMemory"; -import route110 from "./routes/setting/memoryConfig/sureMemory"; -import route111 from "./routes/setting/promptManage/getPrompt"; -import route112 from "./routes/setting/promptManage/updatePrompt"; -import route113 from "./routes/setting/skillManagement/getSkillContent"; -import route114 from "./routes/setting/skillManagement/getSkillList"; -import route115 from "./routes/setting/skillManagement/saveSkillContent"; -import route116 from "./routes/setting/vendorConfig/addVendor"; -import route117 from "./routes/setting/vendorConfig/deleteVendor"; -import route118 from "./routes/setting/vendorConfig/enableEnglishVendor"; -import route119 from "./routes/setting/vendorConfig/getVendorList"; -import route120 from "./routes/setting/vendorConfig/modelTest"; -import route121 from "./routes/setting/vendorConfig/updateCode"; -import route122 from "./routes/setting/vendorConfig/updateVendor"; -import route123 from "./routes/task/getProject"; -import route124 from "./routes/task/getTaskApi"; -import route125 from "./routes/task/getTaskCategories"; -import route126 from "./routes/task/taskDetails"; -import route127 from "./routes/test/test"; +import route76 from "./routes/production/workbench/selectVideo"; +import route77 from "./routes/project/addProject"; +import route78 from "./routes/project/addVisual"; +import route79 from "./routes/project/addVisualManual"; +import route80 from "./routes/project/deleteVisualManual"; +import route81 from "./routes/project/delProject"; +import route82 from "./routes/project/editProject"; +import route83 from "./routes/project/editVisualManual"; +import route84 from "./routes/project/getProject"; +import route85 from "./routes/project/getVisualManual"; +import route86 from "./routes/project/visualManual"; +import route87 from "./routes/script/addScript"; +import route88 from "./routes/script/delScript"; +import route89 from "./routes/script/exportScript"; +import route90 from "./routes/script/extractAssets"; +import route91 from "./routes/script/getScrptApi"; +import route92 from "./routes/script/pollScriptAssets"; +import route93 from "./routes/script/updateScript"; +import route94 from "./routes/scriptAgent/getPlanData"; +import route95 from "./routes/scriptAgent/setPlanData"; +import route96 from "./routes/scriptAgent/updateData"; +import route97 from "./routes/setting/about/checkUpdate"; +import route98 from "./routes/setting/about/downloadApp"; +import route99 from "./routes/setting/agentDeploy/agentSetKey"; +import route100 from "./routes/setting/agentDeploy/deployAgentModel"; +import route101 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route102 from "./routes/setting/dbConfig/clearData"; +import route103 from "./routes/setting/dev/getSwitchAiDevTool"; +import route104 from "./routes/setting/dev/updateSwitchAiDevTool"; +import route105 from "./routes/setting/fileManagement/openFolder"; +import route106 from "./routes/setting/getTextModel"; +import route107 from "./routes/setting/loginConfig/getUser"; +import route108 from "./routes/setting/loginConfig/updateUserPwd"; +import route109 from "./routes/setting/memoryConfig/delAllMemory"; +import route110 from "./routes/setting/memoryConfig/getMemory"; +import route111 from "./routes/setting/memoryConfig/sureMemory"; +import route112 from "./routes/setting/promptManage/getPrompt"; +import route113 from "./routes/setting/promptManage/updatePrompt"; +import route114 from "./routes/setting/skillManagement/getSkillContent"; +import route115 from "./routes/setting/skillManagement/getSkillList"; +import route116 from "./routes/setting/skillManagement/saveSkillContent"; +import route117 from "./routes/setting/vendorConfig/addVendor"; +import route118 from "./routes/setting/vendorConfig/deleteVendor"; +import route119 from "./routes/setting/vendorConfig/enableEnglishVendor"; +import route120 from "./routes/setting/vendorConfig/getVendorList"; +import route121 from "./routes/setting/vendorConfig/modelTest"; +import route122 from "./routes/setting/vendorConfig/updateCode"; +import route123 from "./routes/setting/vendorConfig/updateVendor"; +import route124 from "./routes/task/getProject"; +import route125 from "./routes/task/getTaskApi"; +import route126 from "./routes/task/getTaskCategories"; +import route127 from "./routes/task/taskDetails"; +import route128 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -205,56 +206,57 @@ export default async (app: Express) => { app.use("/api/production/workbench/getGenerateData", route73); app.use("/api/production/workbench/getVideoList", route74); app.use("/api/production/workbench/getVideoModelDetail", route75); - app.use("/api/project/addProject", route76); - app.use("/api/project/addVisual", route77); - app.use("/api/project/addVisualManual", route78); - app.use("/api/project/deleteVisualManual", route79); - app.use("/api/project/delProject", route80); - app.use("/api/project/editProject", route81); - app.use("/api/project/editVisualManual", route82); - app.use("/api/project/getProject", route83); - app.use("/api/project/getVisualManual", route84); - app.use("/api/project/visualManual", route85); - app.use("/api/script/addScript", route86); - app.use("/api/script/delScript", route87); - app.use("/api/script/exportScript", route88); - app.use("/api/script/extractAssets", route89); - app.use("/api/script/getScrptApi", route90); - app.use("/api/script/pollScriptAssets", route91); - app.use("/api/script/updateScript", route92); - app.use("/api/scriptAgent/getPlanData", route93); - app.use("/api/scriptAgent/setPlanData", route94); - app.use("/api/scriptAgent/updateData", route95); - app.use("/api/setting/about/checkUpdate", route96); - app.use("/api/setting/about/downloadApp", route97); - app.use("/api/setting/agentDeploy/agentSetKey", route98); - app.use("/api/setting/agentDeploy/deployAgentModel", route99); - app.use("/api/setting/agentDeploy/getAgentDeploy", route100); - app.use("/api/setting/dbConfig/clearData", route101); - app.use("/api/setting/dev/getSwitchAiDevTool", route102); - app.use("/api/setting/dev/updateSwitchAiDevTool", route103); - app.use("/api/setting/fileManagement/openFolder", route104); - app.use("/api/setting/getTextModel", route105); - app.use("/api/setting/loginConfig/getUser", route106); - app.use("/api/setting/loginConfig/updateUserPwd", route107); - app.use("/api/setting/memoryConfig/delAllMemory", route108); - app.use("/api/setting/memoryConfig/getMemory", route109); - app.use("/api/setting/memoryConfig/sureMemory", route110); - app.use("/api/setting/promptManage/getPrompt", route111); - app.use("/api/setting/promptManage/updatePrompt", route112); - app.use("/api/setting/skillManagement/getSkillContent", route113); - app.use("/api/setting/skillManagement/getSkillList", route114); - app.use("/api/setting/skillManagement/saveSkillContent", route115); - app.use("/api/setting/vendorConfig/addVendor", route116); - app.use("/api/setting/vendorConfig/deleteVendor", route117); - app.use("/api/setting/vendorConfig/enableEnglishVendor", route118); - app.use("/api/setting/vendorConfig/getVendorList", route119); - app.use("/api/setting/vendorConfig/modelTest", route120); - app.use("/api/setting/vendorConfig/updateCode", route121); - app.use("/api/setting/vendorConfig/updateVendor", route122); - app.use("/api/task/getProject", route123); - app.use("/api/task/getTaskApi", route124); - app.use("/api/task/getTaskCategories", route125); - app.use("/api/task/taskDetails", route126); - app.use("/api/test/test", route127); + app.use("/api/production/workbench/selectVideo", route76); + app.use("/api/project/addProject", route77); + app.use("/api/project/addVisual", route78); + app.use("/api/project/addVisualManual", route79); + app.use("/api/project/deleteVisualManual", route80); + app.use("/api/project/delProject", route81); + app.use("/api/project/editProject", route82); + app.use("/api/project/editVisualManual", route83); + app.use("/api/project/getProject", route84); + app.use("/api/project/getVisualManual", route85); + app.use("/api/project/visualManual", route86); + app.use("/api/script/addScript", route87); + app.use("/api/script/delScript", route88); + app.use("/api/script/exportScript", route89); + app.use("/api/script/extractAssets", route90); + app.use("/api/script/getScrptApi", route91); + app.use("/api/script/pollScriptAssets", route92); + app.use("/api/script/updateScript", route93); + app.use("/api/scriptAgent/getPlanData", route94); + app.use("/api/scriptAgent/setPlanData", route95); + app.use("/api/scriptAgent/updateData", route96); + app.use("/api/setting/about/checkUpdate", route97); + app.use("/api/setting/about/downloadApp", route98); + app.use("/api/setting/agentDeploy/agentSetKey", route99); + app.use("/api/setting/agentDeploy/deployAgentModel", route100); + app.use("/api/setting/agentDeploy/getAgentDeploy", route101); + app.use("/api/setting/dbConfig/clearData", route102); + app.use("/api/setting/dev/getSwitchAiDevTool", route103); + app.use("/api/setting/dev/updateSwitchAiDevTool", route104); + app.use("/api/setting/fileManagement/openFolder", route105); + app.use("/api/setting/getTextModel", route106); + app.use("/api/setting/loginConfig/getUser", route107); + app.use("/api/setting/loginConfig/updateUserPwd", route108); + app.use("/api/setting/memoryConfig/delAllMemory", route109); + app.use("/api/setting/memoryConfig/getMemory", route110); + app.use("/api/setting/memoryConfig/sureMemory", route111); + app.use("/api/setting/promptManage/getPrompt", route112); + app.use("/api/setting/promptManage/updatePrompt", route113); + app.use("/api/setting/skillManagement/getSkillContent", route114); + app.use("/api/setting/skillManagement/getSkillList", route115); + app.use("/api/setting/skillManagement/saveSkillContent", route116); + app.use("/api/setting/vendorConfig/addVendor", route117); + app.use("/api/setting/vendorConfig/deleteVendor", route118); + app.use("/api/setting/vendorConfig/enableEnglishVendor", route119); + app.use("/api/setting/vendorConfig/getVendorList", route120); + app.use("/api/setting/vendorConfig/modelTest", route121); + app.use("/api/setting/vendorConfig/updateCode", route122); + app.use("/api/setting/vendorConfig/updateVendor", route123); + app.use("/api/task/getProject", route124); + app.use("/api/task/getTaskApi", route125); + app.use("/api/task/getTaskCategories", route126); + app.use("/api/task/taskDetails", route127); + app.use("/api/test/test", route128); } diff --git a/src/routes/production/workbench/generateVideo.ts b/src/routes/production/workbench/generateVideo.ts index 164166f..542e279 100644 --- a/src/routes/production/workbench/generateVideo.ts +++ b/src/routes/production/workbench/generateVideo.ts @@ -5,6 +5,18 @@ import { v4 as uuidv4 } from "uuid"; import { success } from "@/lib/responseFormat"; import { validateFields } from "@/middleware/middleware"; const router = express.Router(); + +type Type = "imageReference" | "startImage" | "endImage" | "videoReference" | "audioReference"; +interface UploadItem { + fileType: "image" | "video" | "audio"; + type: Type; + sources?: "assets" | "storyboard"; + id?: number; + src?: string; + label?: string; + prompt?: string; +} + export default router.post( "/", validateFields({ @@ -29,23 +41,14 @@ export default router.post( //获取生成视频比例 const ratio = await u.db("o_project").select("videoRatio").where("id", projectId).first(); const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径 - //新增 - const [videoId] = await u.db("o_video").insert({ - filePath: videoPath, - time: Date.now(), - state: "生成中", - scriptId, - projectId, - videoTrackId: trackId, - }); //查询出图片数据 const images = await Promise.all( - uploadData.map(async (item: { id: number; type: string }) => { - if (item.type === "storyboard") { + uploadData.map(async (item: UploadItem) => { + if (item.sources === "storyboard") { const filePath = await u.db("o_storyboard").where("id", item.id).select("filePath").first(); return filePath?.filePath; } - if (item.type === "assets") { + if (item.sources === "assets") { const filePath = await u .db("o_assets") .where("o_assets.id", item.id) @@ -63,6 +66,15 @@ export default router.post( return await u.oss.getImageBase64(item); }), ); + //新增 + const [videoId] = await u.db("o_video").insert({ + filePath: videoPath, + time: Date.now(), + state: "生成中", + scriptId, + projectId, + videoTrackId: trackId, + }); res.status(200).send(success(videoId)); (async () => { try { diff --git a/src/routes/production/workbench/getGenerateData.ts b/src/routes/production/workbench/getGenerateData.ts index 27ebf3b..b69f2d2 100644 --- a/src/routes/production/workbench/getGenerateData.ts +++ b/src/routes/production/workbench/getGenerateData.ts @@ -23,6 +23,7 @@ interface TrackItem { prompt: string; state: "未生成" | "生成中" | "已完成" | "生成失败"; reason?: string; + selectVideoId?: number; medias: TrackMedia[]; videoList: VideoItem[]; } @@ -40,7 +41,6 @@ export default router.post( "videoTrackId", storyboardList.map((s) => s.trackId), ); - console.log("%c Line:40 🌽 videoList", "background:#ffdd4d", videoList); const trackData = await u.db("o_videoTrack").whereIn( //@ts-ignore "id", @@ -56,15 +56,18 @@ export default router.post( prompt: item?.prompt || "", state: (item?.state as "未生成" | "生成中" | "已完成" | "生成失败") ?? "未生成", reason: item?.reason ?? "", + selectVideoId: Number(item?.selectVideoId)!, medias: await Promise.all( storyboardList .filter((s) => s.trackId === trackId) - .map(async (s): Promise => ({ - src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "", - fileType: "image", - ...(s.prompt != null ? { prompt: s.prompt } : {}), - ...(s.id != null ? { id: s.id } : {}), - })), + .map( + async (s): Promise => ({ + src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "", + fileType: "image", + ...(s.prompt != null ? { prompt: s.prompt } : {}), + ...(s.id != null ? { id: s.id } : {}), + }), + ), ), videoList: await Promise.all( videoList diff --git a/src/routes/production/workbench/selectVideo.ts b/src/routes/production/workbench/selectVideo.ts new file mode 100644 index 0000000..e23e06c --- /dev/null +++ b/src/routes/production/workbench/selectVideo.ts @@ -0,0 +1,21 @@ +import express from "express"; +import u from "@/utils"; +import { z } from "zod"; +import { success } from "@/lib/responseFormat"; +import { validateFields } from "@/middleware/middleware"; +const router = express.Router(); + +export default router.post( + "/", + validateFields({ + trackId: z.number(), + videoId: z.number(), + }), + async (req, res) => { + const { trackId, videoId } = req.body; + await u.db("o_videoTrack").where("id", trackId).update({ + selectVideoId: videoId, + }); + res.status(200).send(success({ message: "视频选择成功" })); + }, +); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 0a990cf..d9a6285 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,22 +1,6 @@ -<<<<<<< HEAD -// @db-hash 2c7f828da2621d74d1b0d147d4ba4342 -======= -// @db-hash a27fff5b05e1c9ef490898f17703079a ->>>>>>> bf124d07e35f3d45958f5c2e64a650df7249f737 +// @db-hash 6b1f47596dc417ed5691fe156dc2928f //该文件由脚本自动生成，请勿手动修改 -export interface _o_vendorConfig_old_20260401 { - 'author'?: string | null; - 'code'?: string | null; - 'createTime'?: number | null; - 'description'?: string | null; - 'icon'?: string | null; - 'id'?: string; - 'inputs'?: string | null; - 'inputValues'?: string | null; - 'models'?: string | null; - 'name'?: string | null; -} export interface memories { 'content': string; 'createTime': number; @@ -213,7 +197,6 @@ export interface o_vendorConfig { 'code'?: string | null; 'createTime'?: number | null; 'description'?: string | null; - 'enableEnglish'?: number | null; 'icon'?: string | null; 'id'?: string; 'inputs'?: string | null; @@ -237,12 +220,12 @@ export interface o_videoTrack { 'prompt'?: string | null; 'reason'?: string | null; 'scriptId'?: number | null; + 'selectVideoId'?: string | null; 'state'?: string | null; 'videoId'?: number | null; } export interface DB { - "_o_vendorConfig_old_20260401": _o_vendorConfig_old_20260401; "memories": memories; "o_agentDeploy": o_agentDeploy; "o_agentWorkData": o_agentWorkData;