diff --git a/src/router.ts b/src/router.ts index 617a5fd..bcf8f57 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 6d230b9f278cc0ba49f62f5e48365dea +// @routes-hash 0a85dfe35e0882ce29f9d4fc68c3fd73 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -38,42 +38,43 @@ import route34 from "./routes/production/editStoryboard/generateStoryboardImage" import route35 from "./routes/production/editStoryboard/getStoryboardFlow"; import route36 from "./routes/production/editStoryboard/saveStoryboardFlow"; import route37 from "./routes/production/editStoryboard/updateStoryboardFlow"; -import route38 from "./routes/production/getFlowData"; -import route39 from "./routes/production/getProductionData"; -import route40 from "./routes/production/getStoryboardData"; -import route41 from "./routes/production/saveFlowData"; -import route42 from "./routes/production/workbench/confirmSelection"; -import route43 from "./routes/production/workbench/delVideo"; -import route44 from "./routes/production/workbench/generateVideo"; -import route45 from "./routes/production/workbench/getVideoModelDetail"; -import route46 from "./routes/production/workbench/videoPolling"; -import route47 from "./routes/project/addProject"; -import route48 from "./routes/project/delProject"; -import route49 from "./routes/project/editProject"; -import route50 from "./routes/project/getProject"; -import route51 from "./routes/script/addScript"; -import route52 from "./routes/script/delScript"; -import route53 from "./routes/script/exportScript"; -import route54 from "./routes/script/getScrptApi"; -import route55 from "./routes/script/updateScript"; -import route56 from "./routes/setting/agentDeploy/deployAgentModel"; -import route57 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route58 from "./routes/setting/agentDeploy/updateKey"; -import route59 from "./routes/setting/dbConfig/clearData"; -import route60 from "./routes/setting/getTextModel"; -import route61 from "./routes/setting/loginConfig/getUser"; -import route62 from "./routes/setting/loginConfig/updateUserPwd"; -import route63 from "./routes/setting/memoryConfig/getMemory"; -import route64 from "./routes/setting/memoryConfig/sureMemory"; -import route65 from "./routes/setting/vendorConfig/addVendor"; -import route66 from "./routes/setting/vendorConfig/deleteVendor"; -import route67 from "./routes/setting/vendorConfig/getVendorList"; -import route68 from "./routes/setting/vendorConfig/modelTest"; -import route69 from "./routes/setting/vendorConfig/updateVendor"; -import route70 from "./routes/task/getTaskApi"; -import route71 from "./routes/task/getTaskCategories"; -import route72 from "./routes/task/taskDetails"; -import route73 from "./routes/test/test"; +import route38 from "./routes/production/exportImage"; +import route39 from "./routes/production/getFlowData"; +import route40 from "./routes/production/getProductionData"; +import route41 from "./routes/production/getStoryboardData"; +import route42 from "./routes/production/saveFlowData"; +import route43 from "./routes/production/workbench/confirmSelection"; +import route44 from "./routes/production/workbench/delVideo"; +import route45 from "./routes/production/workbench/generateVideo"; +import route46 from "./routes/production/workbench/getVideoModelDetail"; +import route47 from "./routes/production/workbench/videoPolling"; +import route48 from "./routes/project/addProject"; +import route49 from "./routes/project/delProject"; +import route50 from "./routes/project/editProject"; +import route51 from "./routes/project/getProject"; +import route52 from "./routes/script/addScript"; +import route53 from "./routes/script/delScript"; +import route54 from "./routes/script/exportScript"; +import route55 from "./routes/script/getScrptApi"; +import route56 from "./routes/script/updateScript"; +import route57 from "./routes/setting/agentDeploy/deployAgentModel"; +import route58 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route59 from "./routes/setting/agentDeploy/updateKey"; +import route60 from "./routes/setting/dbConfig/clearData"; +import route61 from "./routes/setting/getTextModel"; +import route62 from "./routes/setting/loginConfig/getUser"; +import route63 from "./routes/setting/loginConfig/updateUserPwd"; +import route64 from "./routes/setting/memoryConfig/getMemory"; +import route65 from "./routes/setting/memoryConfig/sureMemory"; +import route66 from "./routes/setting/vendorConfig/addVendor"; +import route67 from "./routes/setting/vendorConfig/deleteVendor"; +import route68 from "./routes/setting/vendorConfig/getVendorList"; +import route69 from "./routes/setting/vendorConfig/modelTest"; +import route70 from "./routes/setting/vendorConfig/updateVendor"; +import route71 from "./routes/task/getTaskApi"; +import route72 from "./routes/task/getTaskCategories"; +import route73 from "./routes/task/taskDetails"; +import route74 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -113,40 +114,41 @@ export default async (app: Express) => { app.use("/api/production/editStoryboard/getStoryboardFlow", route35); app.use("/api/production/editStoryboard/saveStoryboardFlow", route36); app.use("/api/production/editStoryboard/updateStoryboardFlow", route37); - app.use("/api/production/getFlowData", route38); - app.use("/api/production/getProductionData", route39); - app.use("/api/production/getStoryboardData", route40); - app.use("/api/production/saveFlowData", route41); - app.use("/api/production/workbench/confirmSelection", route42); - app.use("/api/production/workbench/delVideo", route43); - app.use("/api/production/workbench/generateVideo", route44); - app.use("/api/production/workbench/getVideoModelDetail", route45); - app.use("/api/production/workbench/videoPolling", route46); - app.use("/api/project/addProject", route47); - app.use("/api/project/delProject", route48); - app.use("/api/project/editProject", route49); - app.use("/api/project/getProject", route50); - app.use("/api/script/addScript", route51); - app.use("/api/script/delScript", route52); - app.use("/api/script/exportScript", route53); - app.use("/api/script/getScrptApi", route54); - app.use("/api/script/updateScript", route55); - app.use("/api/setting/agentDeploy/deployAgentModel", route56); - app.use("/api/setting/agentDeploy/getAgentDeploy", route57); - app.use("/api/setting/agentDeploy/updateKey", route58); - app.use("/api/setting/dbConfig/clearData", route59); - app.use("/api/setting/getTextModel", route60); - app.use("/api/setting/loginConfig/getUser", route61); - app.use("/api/setting/loginConfig/updateUserPwd", route62); - app.use("/api/setting/memoryConfig/getMemory", route63); - app.use("/api/setting/memoryConfig/sureMemory", route64); - app.use("/api/setting/vendorConfig/addVendor", route65); - app.use("/api/setting/vendorConfig/deleteVendor", route66); - app.use("/api/setting/vendorConfig/getVendorList", route67); - app.use("/api/setting/vendorConfig/modelTest", route68); - app.use("/api/setting/vendorConfig/updateVendor", route69); - app.use("/api/task/getTaskApi", route70); - app.use("/api/task/getTaskCategories", route71); - app.use("/api/task/taskDetails", route72); - app.use("/api/test/test", route73); + app.use("/api/production/exportImage", route38); + app.use("/api/production/getFlowData", route39); + app.use("/api/production/getProductionData", route40); + app.use("/api/production/getStoryboardData", route41); + app.use("/api/production/saveFlowData", route42); + app.use("/api/production/workbench/confirmSelection", route43); + app.use("/api/production/workbench/delVideo", route44); + app.use("/api/production/workbench/generateVideo", route45); + app.use("/api/production/workbench/getVideoModelDetail", route46); + app.use("/api/production/workbench/videoPolling", route47); + app.use("/api/project/addProject", route48); + app.use("/api/project/delProject", route49); + app.use("/api/project/editProject", route50); + app.use("/api/project/getProject", route51); + app.use("/api/script/addScript", route52); + app.use("/api/script/delScript", route53); + app.use("/api/script/exportScript", route54); + app.use("/api/script/getScrptApi", route55); + app.use("/api/script/updateScript", route56); + app.use("/api/setting/agentDeploy/deployAgentModel", route57); + app.use("/api/setting/agentDeploy/getAgentDeploy", route58); + app.use("/api/setting/agentDeploy/updateKey", route59); + app.use("/api/setting/dbConfig/clearData", route60); + app.use("/api/setting/getTextModel", route61); + app.use("/api/setting/loginConfig/getUser", route62); + app.use("/api/setting/loginConfig/updateUserPwd", route63); + app.use("/api/setting/memoryConfig/getMemory", route64); + app.use("/api/setting/memoryConfig/sureMemory", route65); + app.use("/api/setting/vendorConfig/addVendor", route66); + app.use("/api/setting/vendorConfig/deleteVendor", route67); + app.use("/api/setting/vendorConfig/getVendorList", route68); + app.use("/api/setting/vendorConfig/modelTest", route69); + app.use("/api/setting/vendorConfig/updateVendor", route70); + app.use("/api/task/getTaskApi", route71); + app.use("/api/task/getTaskCategories", route72); + app.use("/api/task/taskDetails", route73); + app.use("/api/test/test", route74); } diff --git a/src/routes/production/exportImage.ts b/src/routes/production/exportImage.ts new file mode 100644 index 0000000..fdddd2c --- /dev/null +++ b/src/routes/production/exportImage.ts @@ -0,0 +1,20 @@ +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(); +import { flowDataSchema } from "@/agents/productionAgent/tools"; + +export default router.post( + "/", + validateFields({ + projectId: z.number(), + episodesId: z.number(), + data: flowDataSchema, + }), + async (req, res) => { + const { projectId, episodesId } = req.body; + return res.status(200).send(success()); + }, +); diff --git a/src/routes/production/getStoryboardData.ts b/src/routes/production/getStoryboardData.ts index 2e9f0e5..eb8af34 100644 --- a/src/routes/production/getStoryboardData.ts +++ b/src/routes/production/getStoryboardData.ts @@ -22,6 +22,68 @@ export default router.post( }; }), ); - res.status(200).send(success(data)); + + //获取相关资产 + const storyboardIds = storyboardData.map((s) => s.id as number); + + // 修复：o_assets.id 关联 o_assets2Storyboard.assetId，按 storyboardId 过滤 + const storyboardConfigs = await u + .db("o_assets2Storyboard") + .leftJoin("o_assets", "o_assets2Storyboard.assetId", "o_assets.id") + .leftJoin("o_image", "o_assets.imageId", "o_image.id") + .whereIn("o_assets2Storyboard.storyboardId", storyboardIds) + .select("o_assets2Storyboard.storyboardId", "o_assets.id as assetId", "o_assets.name", "o_assets.type", "o_image.filePath as avatar"); + + // 按 storyboardId 分组，生成 characters 列表 + const storyboardCharactersMap = storyboardConfigs.reduce>((acc, cur) => { + const storyboardId = cur.storyboardId as number; + if (!acc[storyboardId]) { + acc[storyboardId] = []; + } + const character: { name: string; type: string; avatar?: string } = { + name: cur.name ?? "", + type: cur.type ?? "", + }; + if (cur.avatar) { + character.avatar = cur.avatar; + } + acc[storyboardId].push(character); + return acc; + }, {}); + + // 组装最终数据，符合 Shot 接口格式 + const result = await Promise.all( + data.map(async (item) => { + const characters = storyboardCharactersMap[item.id as number] ?? []; + // 处理 characters 中的 avatar OSS 路径 + const charactersWithUrl = await Promise.all( + characters.map(async (c) => { + if (c.avatar) { + return { ...c, avatar: await u.oss.getFileUrl(c.avatar) }; + } + return c; + }), + ); + return { + id: String(item.id), + camera: item.camera ? Number(item.camera) : undefined, + createTime: item.createTime ?? undefined, + description: item.description ?? undefined, + duration: item.duration ? Number(item.duration) : undefined, + filePath: item.filePath || undefined, + frameMode: item.frameMode ? Number(item.frameMode) : undefined, + mode: item.mode ?? "", + model: item.model ?? "", + prompt: item.prompt ?? undefined, + resolution: item.resolution ?? undefined, + scriptId: item.scriptId ?? undefined, + sound: item.sound ? Number(item.sound) : undefined, + title: item.title ?? undefined, + characters: charactersWithUrl, + }; + }), + ); + + res.status(200).send(success(result)); }, ); diff --git a/src/routes/production/workbench/generateVideo.ts b/src/routes/production/workbench/generateVideo.ts index b035516..dcfbd7d 100644 --- a/src/routes/production/workbench/generateVideo.ts +++ b/src/routes/production/workbench/generateVideo.ts @@ -118,7 +118,7 @@ export default router.post( }); await aiVideo.save(videoPath); await u.db("o_video").where("id", videoId).update({ state: "生成成功" }); - await u.db("o_videoConfig").where("storyboardId", storyboardId).update({ videoId, updateTime: Date.now() }); + // await u.db("o_videoConfig").where("storyboardId", storyboardId).update({ videoId, updateTime: Date.now() }); } catch (error: any) { await u .db("o_video") diff --git a/src/types/database.d.ts b/src/types/database.d.ts index ce05685..745de96 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash d0e44c9c923897d847cded0a28012baf +// @db-hash 56071dcf512e84c37ffd555806af7162 //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -59,7 +59,7 @@ export interface o_eventChapter { export interface o_flowData { 'createTime'?: number | null; 'data'?: string | null; - 'episodesId'?: number | null; + 'espisodeId'?: number | null; 'id'?: number; 'key'?: string | null; 'projectId'?: number | null; @@ -117,25 +117,25 @@ export interface o_setting { 'value'?: string | null; } export interface o_storyboard { - 'associateAssetsIds'?: string | null; 'camera'?: string | null; 'createTime'?: number | null; + 'description'?: string | null; 'duration'?: string | null; 'filePath'?: string | null; - 'frameType'?: string | null; + 'frameMode'?: string | null; 'id'?: number; 'mode'?: string | null; 'model'?: string | null; - 'name'?: string | null; 'prompt'?: string | null; 'resolution'?: string | null; 'scriptId'?: number | null; 'sound'?: string | null; + 'title'?: string | null; } export interface o_storyboardFlow { 'flowData': string; 'id'?: number; - 'stroryboardId': number; + 'storyboardId': number; } export interface o_tasks { 'describe'?: string | null;