0.0.8.5

app/api/trees/[treeId]/members/[memberId]/history/route.ts

@@ -0,0 +1,72 @@
+import { NextRequest, NextResponse } from "next/server"
+import { getServerSession } from "next-auth"
+import { authOptions } from "@/lib/auth"
+import { prisma } from "@/lib/prisma"
+import { checkPermission } from "@/lib/permissions"
+
+// 获取成员的历史版本
+export async function GET(
+  req: NextRequest,
+  { params }: { params: Promise<{ treeId: string; memberId: string }> }
+) {
+  try {
+    const session = await getServerSession(authOptions)
+    
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: "未授权" }, { status: 401 })
+    }
+
+    const { treeId, memberId } = await params
+
+    // 检查权限
+    const { hasPermission } = await checkPermission(session.user.id, treeId)
+    if (!hasPermission) {
+      return NextResponse.json({ error: "无权访问此家族树" }, { status: 403 })
+    }
+
+    // 获取成员历史记录
+    const historyRecords = await prisma.memberHistory.findMany({
+      where: {
+        memberId,
+        treeId,
+      },
+      orderBy: {
+        version: 'desc',
+      },
+    })
+
+    // 获取所有相关用户ID
+    const userIds = [...new Set(historyRecords.map(h => h.changedBy))]
+    
+    // 批量获取用户信息
+    const users = await prisma.user.findMany({
+      where: {
+        id: {
+          in: userIds
+        }
+      },
+      select: {
+        id: true,
+        name: true,
+        email: true,
+      }
+    })
+
+    // 创建用户映射
+    const userMap = new Map(users.map(u => [u.id, u]))
+
+    // 组合历史记录和用户信息
+    const history = historyRecords.map(record => ({
+      ...record,
+      user: userMap.get(record.changedBy) || null
+    }))
+
+    return NextResponse.json({ history })
+  } catch (error) {
+    console.error("获取成员历史失败:", error)
+    return NextResponse.json(
+      { error: "获取成员历史失败" },
+      { status: 500 }
+    )
+  }
+}

app/api/trees/[treeId]/members/[memberId]/route.ts

@@ -4,6 +4,7 @@ import { authOptions } from "@/lib/auth"
 import { prisma } from "@/lib/prisma"
 import { checkPermission } from "@/lib/permissions"
 import { Role } from "@prisma/client"
+import { recordMemberHistory } from "@/lib/member-history"
 
 // 获取单个成员
 export async function GET(
@@ -257,7 +258,17 @@ export async function PATCH(
       }
     }
 
-    // 记录操作日志
+    // 记录成员历史版本
+    const historyRecord = await recordMemberHistory({
+      memberId: member.id,
+      treeId,
+      changedBy: session.user.id,
+      changeType: 'UPDATE',
+      oldData: existingMember,
+      newData: member
+    })
+
+    // 记录操作日志，使用历史记录中的详细变更信息
     await prisma.activityLog.create({
       data: {
         treeId,
@@ -266,7 +277,7 @@ export async function PATCH(
         entityType: 'MEMBER',
         entityId: member.id,
         entityName: member.fullName,
-        changes: body,
+        changes: historyRecord?.changes || body,
       }
     })
 

app/api/trees/[treeId]/members/route.ts

@@ -5,6 +5,7 @@ import { prisma } from "@/lib/prisma"
 import { checkPermission } from "@/lib/permissions"
 import { Role, Gender } from "@prisma/client"
 import { z } from "zod"
+import { recordMemberHistory } from "@/lib/member-history"
 
 const createMemberSchema = z.object({
   surname: z.string().min(1),
@@ -211,6 +212,15 @@ export async function POST(
       }
     }
 
+    // 记录成员历史版本
+    await recordMemberHistory({
+      memberId: member.id,
+      treeId,
+      changedBy: session.user.id,
+      changeType: 'CREATE',
+      newData: member
+    })
+
     // 记录操作日志
     await prisma.activityLog.create({
       data: {

app/api/upload/route.ts

@@ -0,0 +1,70 @@
+import { NextRequest, NextResponse } from 'next/server'
+import { writeFile, mkdir } from 'fs/promises'
+import { join } from 'path'
+import { existsSync } from 'fs'
+import { getServerSession } from 'next-auth'
+import { authOptions } from '@/lib/auth'
+
+export async function POST(req: NextRequest) {
+  try {
+    // 验证用户登录
+    const session = await getServerSession(authOptions)
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: '未授权' }, { status: 401 })
+    }
+
+    const formData = await req.formData()
+    const file = formData.get('file') as File
+    
+    if (!file) {
+      return NextResponse.json({ error: '没有文件' }, { status: 400 })
+    }
+
+    // 验证文件类型
+    if (!file.type.startsWith('image/')) {
+      return NextResponse.json({ error: '只能上传图片文件' }, { status: 400 })
+    }
+
+    // 验证文件大小（限制为 5MB）
+    const maxSize = 5 * 1024 * 1024 // 5MB
+    if (file.size > maxSize) {
+      return NextResponse.json({ error: '文件大小不能超过 5MB' }, { status: 400 })
+    }
+
+    // 读取文件内容
+    const bytes = await file.arrayBuffer()
+    const buffer = Buffer.from(bytes)
+
+    // 确保上传目录存在
+    const uploadDir = join(process.cwd(), 'public', 'uploads')
+    if (!existsSync(uploadDir)) {
+      await mkdir(uploadDir, { recursive: true })
+    }
+
+    // 生成唯一文件名
+    const timestamp = Date.now()
+    const randomStr = Math.random().toString(36).substring(2, 8)
+    const ext = file.name.split('.').pop()
+    const fileName = `${timestamp}-${randomStr}.${ext}`
+    
+    // 保存文件
+    const filePath = join(uploadDir, fileName)
+    await writeFile(filePath, buffer)
+
+    // 返回可访问的 URL
+    const url = `/uploads/${fileName}`
+    
+    return NextResponse.json({ 
+      url,
+      fileName,
+      size: file.size,
+      type: file.type,
+    })
+  } catch (error) {
+    console.error('上传文件失败:', error)
+    return NextResponse.json(
+      { error: '上传文件失败' },
+      { status: 500 }
+    )
+  }
+}

app/api/user/activity-logs/route.ts

@@ -48,6 +48,7 @@ export async function GET(req: NextRequest) {
         },
         tree: {
           select: {
+            id: true,
             name: true
           }
         }