diff --git a/src/router.ts b/src/router.ts index 72185e4..f0ea325 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 8097a5206252be753261d3f059243260 +// @routes-hash 557dfd43a824a4bd4170d0e2c9a6b45c import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -94,10 +94,11 @@ import route90 from "./routes/setting/vendorConfig/deleteVendor"; import route91 from "./routes/setting/vendorConfig/getVendorList"; import route92 from "./routes/setting/vendorConfig/modelTest"; import route93 from "./routes/setting/vendorConfig/updateVendor"; -import route94 from "./routes/task/getTaskApi"; -import route95 from "./routes/task/getTaskCategories"; -import route96 from "./routes/task/taskDetails"; -import route97 from "./routes/test/test"; +import route94 from "./routes/task/getProject"; +import route95 from "./routes/task/getTaskApi"; +import route96 from "./routes/task/getTaskCategories"; +import route97 from "./routes/task/taskDetails"; +import route98 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -193,8 +194,9 @@ export default async (app: Express) => { app.use("/api/setting/vendorConfig/getVendorList", route91); app.use("/api/setting/vendorConfig/modelTest", route92); app.use("/api/setting/vendorConfig/updateVendor", route93); - app.use("/api/task/getTaskApi", route94); - app.use("/api/task/getTaskCategories", route95); - app.use("/api/task/taskDetails", route96); - app.use("/api/test/test", route97); + app.use("/api/task/getProject", route94); + app.use("/api/task/getTaskApi", route95); + app.use("/api/task/getTaskCategories", route96); + app.use("/api/task/taskDetails", route97); + app.use("/api/test/test", route98); } diff --git a/src/routes/task/getProject.ts b/src/routes/task/getProject.ts new file mode 100644 index 0000000..ca73fe6 --- /dev/null +++ b/src/routes/task/getProject.ts @@ -0,0 +1,10 @@ +import express from "express"; +import u from "@/utils"; +import { success } from "@/lib/responseFormat"; +const router = express.Router(); + +export default router.post("/", async (req, res) => { + const list = await u.db("o_project").select("id", "name").groupBy("name"); + const data = list.filter((item) => item.name); + res.status(200).send(success(data)); +}); diff --git a/src/routes/task/getTaskApi.ts b/src/routes/task/getTaskApi.ts index 9e7c769..92c5974 100644 --- a/src/routes/task/getTaskApi.ts +++ b/src/routes/task/getTaskApi.ts @@ -9,11 +9,12 @@ export default router.post( validateFields({ state: z.string().optional().nullable(), taskClass: z.string().optional().nullable(), + projectId: z.number().optional().nullable(), page: z.number(), limit: z.number(), }), async (req, res) => { - const { taskClass, state, page = 1, limit = 10 }: any = req.body; + const { taskClass, state, projectId, page = 1, limit = 10 }: any = req.body; const offset = (page - 1) * limit; const data = await u .db("o_tasks") @@ -25,6 +26,9 @@ export default router.post( if (state) { qb.andWhere("o_tasks.state", state); } + if (projectId) { + qb.andWhere("o_tasks.projectId", projectId); + } }) .select("o_tasks.*", "o_project.* ") .offset(offset) @@ -36,6 +40,9 @@ export default router.post( if (taskClass) { qb.andWhere("o_tasks.taskClass", taskClass); } + if (projectId) { + qb.andWhere("o_tasks.projectId", projectId); + } if (state) { qb.andWhere("o_tasks.state", state); } diff --git a/src/routes/task/getTaskCategories.ts b/src/routes/task/getTaskCategories.ts index cb60760..f608cba 100644 --- a/src/routes/task/getTaskCategories.ts +++ b/src/routes/task/getTaskCategories.ts @@ -1,17 +1,10 @@ import express from "express"; import u from "@/utils"; import { success } from "@/lib/responseFormat"; -import { validateFields } from "@/middleware/middleware"; -import { number, z } from "zod"; const router = express.Router(); -export default router.post( - "/", - validateFields({ - projectId: z.number(), - }), - async (req, res) => { - const data = await u.db("o_tasks").where("projectId", req.body.projectId).select("taskClass").groupBy("taskClass"); - res.status(200).send(success(data)); - }, -); +export default router.post("/", async (req, res) => { + const list = await u.db("o_tasks").select("taskClass").groupBy("taskClass"); + const data = list.filter((item) => item.taskClass); + res.status(200).send(success(data)); +}); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 3e58c97..70b079c 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,25 +1,6 @@ -// @db-hash ce28b6d566911952421c2661e14bfde5 +// @db-hash d807205fbb27fc5ddb04cae060fb4430 //该文件由脚本自动生成,请勿手动修改 -export interface _o_storyboard_old_20260325 { - 'camera'?: string | null; - 'createTime'?: number | null; - 'description'?: string | null; - 'duration'?: string | null; - 'filePath'?: string | null; - 'frameMode'?: string | null; - 'id'?: number; - 'lines'?: string | null; - 'mode'?: string | null; - 'model'?: string | null; - 'prompt'?: string | null; - 'reason'?: string | null; - 'resolution'?: string | null; - 'scriptId'?: number | null; - 'sound'?: string | null; - 'state'?: string | null; - 'title'?: string | null; -} export interface memories { 'content': string; 'createTime': number; @@ -127,11 +108,13 @@ export interface o_project { 'artStyle'?: string | null; 'createTime'?: number | null; 'id'?: number | null; + 'imageModel'?: string | null; 'intro'?: string | null; 'name'?: string | null; 'projectType'?: string | null; 'type'?: string | null; 'userId'?: number | null; + 'videoModel'?: string | null; 'videoRatio'?: string | null; } export interface o_script { @@ -237,7 +220,6 @@ export interface o_videoConfig { } export interface DB { - "_o_storyboard_old_20260325": _o_storyboard_old_20260325; "memories": memories; "o_agentDeploy": o_agentDeploy; "o_agentWorkData": o_agentWorkData; diff --git a/src/utils/ai.ts b/src/utils/ai.ts index 9ab1a75..a06d83b 100644 --- a/src/utils/ai.ts +++ b/src/utils/ai.ts @@ -137,8 +137,6 @@ class AiVideo { async run(input: VideoConfig) { return withTaskRecord(this.key, input.taskClass, input.describe, input.relatedObjects, input.projectId, async (modelName) => { const fn = await getVendorTemplateFn("videoRequest", modelName); - - console.log("%c Line:142 🎂 input", "background:#42b983", input); this.result = await fn(input); if (this.result.startsWith("http")) this.result = await urlToBase64(this.result); return this;