共 {imagesData?.pagination.total || 0} 条记录
+ {imagesData?.pagination.totalImages !== undefined ||
+ imagesData?.pagination.totalVideos !== undefined
+ ? `（图片 ${imagesData?.pagination.totalImages || 0} / 视频 ${imagesData?.pagination.totalVideos || 0}）`
+ : ""}
{/* 图片网格 */}
@@ -2477,14 +2491,29 @@ export function AdminSettingsClient() {
onClick={() => setSelectedImage(img)}
>
- 
+ {img.recordType === "video" ? (
+
+ ) : (
+
+ )}
+ {img.recordType === "video" ? (
+
- 图片详情
- {selectedImage?.isFeatured && (
+ {selectedImage?.recordType === "video" ? "视频详情" : "图片详情"}
+ {selectedImage?.recordType !== "video" && selectedImage?.isFeatured && (
]+src="([^"]+)"/i);
+ if (htmlMatch?.[1]) return htmlMatch[1];
+
+ const markdownMatch = text.match(/\[[^\]]*]\((https?:\/\/[^)\s]+\.mp4(?:\?[^)\s]*)?)\)/i);
+ if (markdownMatch?.[1]) return markdownMatch[1];
+
+ const plainMatch = text.match(/(https?:\/\/[^\s"'<>]+\.mp4(?:\?[^\s"'<>]+)?)/i);
+ return plainMatch?.[1] || null;
+}
+
export async function GET(request: NextRequest) {
try {
const session = await auth();
@@ -31,8 +52,16 @@ export async function GET(request: NextRequest) {
const endDate = searchParams.get("endDate");
// 构建查询条件
- const conditions = [];
-
+ const imageConditions = [];
+ const videoConditions = [
+ eq(message.role, "assistant"),
+ or(
+ isNotNull(message.temporaryVideoUrl),
+ isNotNull(message.permanentVideoUrl),
+ sql`${message.parts}::text ILIKE '% 0) {
- const userIds = matchingUsers.map(u => u.id);
- conditions.push(sql`${generatedImage.userId} IN (${sql.join(userIds.map(id => sql`${id}`), sql`, `)})`);
+ const matchedUserIds = matchingUsers.map((u) => u.id);
+ imageConditions.push(
+ sql`${generatedImage.userId} IN (${sql.join(matchedUserIds.map((id) => sql`${id}`), sql`, `)})`
+ );
+ videoConditions.push(
+ sql`${chat.userId} IN (${sql.join(matchedUserIds.map((id) => sql`${id}`), sql`, `)})`
+ );
} else {
// 没有匹配的用户，返回空结果
return NextResponse.json({
@@ -56,27 +90,43 @@ export async function GET(request: NextRequest) {
}
if (startDate) {
- conditions.push(gte(generatedImage.createdAt, new Date(startDate)));
+ const start = new Date(startDate);
+ imageConditions.push(gte(generatedImage.createdAt, start));
+ videoConditions.push(gte(message.createdAt, start));
}
if (endDate) {
const end = new Date(endDate);
end.setHours(23, 59, 59, 999);
- conditions.push(lte(generatedImage.createdAt, end));
+ imageConditions.push(lte(generatedImage.createdAt, end));
+ videoConditions.push(lte(message.createdAt, end));
}
- const whereClause = conditions.length > 0 ? and(...conditions) : undefined;
+ const imageWhereClause = imageConditions.length > 0 ? and(...imageConditions) : undefined;
+ const videoWhereClause = videoConditions.length > 0 ? and(...videoConditions) : undefined;
- // 查询总数
- const countResult = await db
+ // 查询图片总数
+ const imageCountResult = await db
.select({ count: sql`count(*)::int` })
.from(generatedImage)
- .where(whereClause);
-
- const total = countResult[0]?.count || 0;
+ .where(imageWhereClause);
+
+ // 查询视频总数
+ const videoCountResult = await db
+ .select({ count: sql`count(*)::int` })
+ .from(message)
+ .innerJoin(chat, eq(message.chatId, chat.id))
+ .where(videoWhereClause);
+
+ const totalImages = imageCountResult[0]?.count || 0;
+ const totalVideos = videoCountResult[0]?.count || 0;
+ const total = totalImages + totalVideos;
+ const totalPages = Math.ceil(total / pageSize);
+
+ const fetchLimit = Math.max(page * pageSize, pageSize);
// 查询图片列表（包含用户信息）
- const images = await db
+ const imageRows = await db
.select({
id: generatedImage.id,
userId: generatedImage.userId,
@@ -93,19 +143,91 @@ export async function GET(request: NextRequest) {
featuredAt: generatedImage.featuredAt,
createdAt: generatedImage.createdAt,
chatId: generatedImage.chatId,
+ recordType: sql<"image">`'image'`,
+ videoUrl: sql`null`,
})
.from(generatedImage)
.leftJoin(user, eq(generatedImage.userId, user.id))
- .where(whereClause)
+ .where(imageWhereClause)
.orderBy(desc(generatedImage.createdAt))
- .limit(pageSize)
- .offset(offset);
+ .limit(fetchLimit);
- const totalPages = Math.ceil(total / pageSize);
+ // 查询视频列表（来自消息表）
+ const videoRows = await db
+ .select({
+ id: message.id,
+ userId: chat.userId,
+ userName: user.name,
+ userEmail: user.email,
+ userDepartment: user.department,
+ temporaryVideoUrl: message.temporaryVideoUrl,
+ permanentVideoUrl: message.permanentVideoUrl,
+ parts: message.parts,
+ videoMetadata: message.videoMetadata,
+ createdAt: message.createdAt,
+ chatId: message.chatId,
+ })
+ .from(message)
+ .innerJoin(chat, eq(message.chatId, chat.id))
+ .leftJoin(user, eq(chat.userId, user.id))
+ .where(videoWhereClause)
+ .orderBy(desc(message.createdAt))
+ .limit(fetchLimit);
+
+ const normalizedVideos = videoRows
+ .map((item) => {
+ const metadata = (item.videoMetadata as Record | null) || {};
+ const videoUrl =
+ item.permanentVideoUrl ||
+ item.temporaryVideoUrl ||
+ extractVideoUrlFromParts(item.parts);
+
+ if (!videoUrl) return null;
+
+ const resolution =
+ typeof metadata.resolution === "string" && metadata.resolution.trim()
+ ? metadata.resolution.trim()
+ : null;
+ const prompt =
+ typeof metadata.prompt === "string" && metadata.prompt.trim()
+ ? metadata.prompt.trim()
+ : null;
+ const modelId =
+ typeof metadata.model === "string" && metadata.model.trim()
+ ? metadata.model.trim()
+ : null;
+
+ return {
+ id: `video-${item.id}`,
+ sourceMessageId: item.id,
+ userId: item.userId,
+ userName: item.userName,
+ userEmail: item.userEmail,
+ userDepartment: item.userDepartment,
+ thumbnailUrl: videoUrl,
+ originalUrl: videoUrl,
+ videoUrl,
+ imageSize: resolution,
+ prompt,
+ modelId,
+ isFeatured: false,
+ featuredCategory: null,
+ featuredAt: null,
+ createdAt: item.createdAt,
+ chatId: item.chatId,
+ recordType: "video" as const,
+ };
+ })
+ .filter((item): item is NonNullable => Boolean(item));
+
+ const merged = [...imageRows, ...normalizedVideos].sort(
+ (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
+ );
+ const images = merged.slice(offset, offset + pageSize);
return NextResponse.json({
images,
- pagination: { page, pageSize, total, totalPages }
+ pagination: { page, pageSize, total, totalPages, totalImages, totalVideos }
});
} catch (error) {
console.error("[Admin Images API] Error:", error);
+
+
+ ) : null}
{/* 精选图标 */}
- {img.isFeatured && (
+ {img.recordType !== "video" && img.isFeatured && (
- 
+ {selectedImage.recordType === "video" ? (
+
+ ) : (
+
+ )}
@@ -2582,18 +2620,22 @@ export function AdminSettingsClient() {
{new Date(selectedImage.createdAt).toLocaleString("zh-CN")}
-
+
{selectedImage.imageSize || "未知"}
{selectedImage.modelId || "未知"}
-
-
- {selectedImage.isFeatured && selectedImage.featuredAt && (
+ {selectedImage.recordType !== "video" ? (
+ {selectedImage.featuredCategory || "未设置"}
-
+
+
+ ) : null}
+ {selectedImage.recordType !== "video" && selectedImage.isFeatured && selectedImage.featuredAt && (
{selectedImage.featuredCategory || "未设置"}
+{new Date(selectedImage.featuredAt).toLocaleString("zh-CN")}
@@ -2604,34 +2646,64 @@ export function AdminSettingsClient() {{selectedImage.prompt || "无"}
-
)}
diff --git a/app/api/admin/images/route.ts b/app/api/admin/images/route.ts
index 2367f6ef5..332642ce0 100644
--- a/app/api/admin/images/route.ts
+++ b/app/api/admin/images/route.ts
@@ -1,9 +1,30 @@
import { NextRequest, NextResponse } from "next/server";
import { db } from "@/lib/db";
-import { generatedImage, user } from "@/lib/db/schema";
-import { eq, desc, sql, and, gte, lte, like, or } from "drizzle-orm";
+import { chat, generatedImage, message, user } from "@/lib/db/schema";
+import { eq, desc, sql, and, gte, lte, like, or, isNotNull } from "drizzle-orm";
import { auth } from "@/app/(auth)/auth";
+function extractVideoUrlFromParts(parts: unknown): string | null {
+ const text = Array.isArray(parts)
+ ? parts
+ .map((part) => (part && typeof part === "object" && "text" in part ? String((part as any).text || "") : ""))
+ .join("\n")
+ : typeof parts === "string"
+ ? parts
+ : "";
+
+ if (!text) return null;
+
+ const htmlMatch = text.match(/
-
-
+ {selectedImage.recordType !== "video" ? (
+
+ ) : null}
+
-
-
+
+
+
+