From bbd9769e5ad2447a38972019eca70d323ccdc2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683>
Date: Sat, 11 Apr 2026 16:05:58 +0800
Subject: [PATCH 1/2] no message

---
 .../workbench/generateVideoPrompt.ts          | 11 +++---
 src/types/database.d.ts                       | 37 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/routes/production/workbench/generateVideoPrompt.ts b/src/routes/production/workbench/generateVideoPrompt.ts
index 9d0895c..474444a 100644
--- a/src/routes/production/workbench/generateVideoPrompt.ts
+++ b/src/routes/production/workbench/generateVideoPrompt.ts
@@ -42,7 +42,7 @@ export default router.post(
         }
         if (item.sources === "assets") {
           // 查询素材
-          const assetsData = await u.db("o_assets").where("o_assets.id", item.id).select("id", "type", "name").first();
+          const assetsData = await u.db("o_assets").leftJoin("o_image","o_image.id","o_assets.imageId").where("o_assets.id", item.id).select("o_assets.id", "o_assets.type", "o_assets.name","o_image.filePath").first();
           return {
             ...assetsData,
             _type: "assets", // 标记类型
@@ -61,6 +61,7 @@ export default router.post(
           id: item.id,
           type: item.type,
           name: item.name,
+          filePath:item.filePath
         });
       if (item._type === "storyboard")
         storyboard.push({
@@ -85,18 +86,16 @@ export default router.post(
     const visualManual = u.getArtPrompt(artStyle, "art_skills", "art_storyboard_video");
     const content = `
           **模型名称**：${modelData},
-          **资产信息**（角色、场景、道具):${assets.map((i) => `[${i.id},${i.type},${i.name}]`).join("，")},
+          **资产信息**（角色、场景、道具):${assets.filter(i => i.filePath).map((i) => `[${i.id},${i.type},${i.name}]`).join("，")},
           **分镜信息**：${storyboard.map(
             (i) => `<storyboardItem
   videoDesc='${i.videoDesc}'
-  prompt='${i.prompt}'
-  track='${i.track}'
   duration='${i.duration}'
-  associateAssetsIds='[${i.associateAssetsIds}]'
-  shouldGenerateImage='${i.shouldGenerateImage == 1 ? "true" : "false"}'
 ></storyboardItem>`,
           )},
           `;
+    console.log("%c Line:87 🌮 content", "background:#2eafb0", content);
+
     try {
       const { text } = await u.Ai.Text("universalAi").invoke({
         system: videoPromptGeneration,
diff --git a/src/types/database.d.ts b/src/types/database.d.ts
index a787e02..1c5144d 100644
--- a/src/types/database.d.ts
+++ b/src/types/database.d.ts
@@ -1,6 +1,37 @@
-// @db-hash 71e339c0a728c10bedb294a93976dcd8
+// @db-hash 1447c7bc591208825cce903d05b0045c
 //该文件由脚本自动生成，请勿手动修改
 
+export interface _o_project_old_20260404 {
+  'artStyle'?: string | null;
+  'createTime'?: number | null;
+  'directorManual'?: string | null;
+  'id'?: number | null;
+  'imageModel'?: string | null;
+  'imageQuality'?: string | null;
+  'intro'?: string | null;
+  'mode'?: string | null;
+  'name'?: string | null;
+  'projectType'?: string | null;
+  'type'?: string | null;
+  'userId'?: number | null;
+  'videoModel'?: string | null;
+  'videoRatio'?: string | null;
+}
+export interface _o_prompt_old_20260406 {
+  'data'?: string | null;
+  'id'?: number;
+  'name'?: string | null;
+  'type'?: string | null;
+  'useData'?: string | null;
+}
+export interface _o_prompt_old_20260406_1 {
+  'data'?: string | null;
+  'id'?: number;
+  'name'?: string | null;
+  'TEXT'?: any | null;
+  'type'?: string | null;
+  'useData'?: string | null;
+}
 export interface memories {
   'content': string;
   'createTime': number;
@@ -202,7 +233,6 @@ export interface o_user {
 }
 export interface o_vendorConfig {
   'author'?: string | null;
-  'code'?: string | null;
   'createTime'?: number | null;
   'description'?: string | null;
   'enable'?: number | null;
@@ -236,6 +266,9 @@ export interface o_videoTrack {
 }
 
 export interface DB {
+  "_o_project_old_20260404": _o_project_old_20260404;
+  "_o_prompt_old_20260406": _o_prompt_old_20260406;
+  "_o_prompt_old_20260406_1": _o_prompt_old_20260406_1;
   "memories": memories;
   "o_agentDeploy": o_agentDeploy;
   "o_agentWorkData": o_agentWorkData;

From 97dfe722782c48f300cc9a1b26907217775ddd7d Mon Sep 17 00:00:00 2001
From: zhishi <1951671751@qq.com>
Date: Sat, 11 Apr 2026 17:46:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=95=9C?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=B5=84=E4=BA=A7=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/production/getFlowData.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/routes/production/getFlowData.ts b/src/routes/production/getFlowData.ts
index 4afd932..6917d08 100644
--- a/src/routes/production/getFlowData.ts
+++ b/src/routes/production/getFlowData.ts
@@ -99,7 +99,8 @@ export default router.post(
           }),
         );
         const storyboardIds = storyboardData.map((i) => i.id);
-        const assetsIds = await u.db("o_assets2Storyboard").whereIn("storyboardId", storyboardIds);
+        const assetsIds = await u.db("o_assets2Storyboard").whereIn("storyboardId", storyboardIds).orderBy("rowid");
+
         const assets2StoryboardMap: Record<number, number[]> = {};
         assetsIds.forEach((i) => {
           if (!assets2StoryboardMap[i.storyboardId!]) {