feat: align with upstream 1.5.9.9
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
import { defineEventHandler, getRouterParam } from 'h3'
|
||||
import { db } from '~/drizzle/db'
|
||||
import { gradeClass } from '~/drizzle/schema'
|
||||
import { eq } from 'drizzle-orm'
|
||||
import { createApiError } from '~~/server/utils/apiError'
|
||||
import { SERVER_ERROR_CODES } from '~~/server/config/constants'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
// 检查认证和权限
|
||||
const user = event.context.user
|
||||
if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
|
||||
throw createApiError(403, SERVER_ERROR_CODES.COMMON_INSUFFICIENT_PERMISSION, '没有权限访问')
|
||||
}
|
||||
|
||||
const id = Number(getRouterParam(event, 'id'))
|
||||
if (!Number.isInteger(id) || id <= 0) {
|
||||
throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, '无效的配置 ID')
|
||||
}
|
||||
|
||||
const existing = await db.query.gradeClass.findFirst({
|
||||
where: eq(gradeClass.id, id),
|
||||
columns: { id: true }
|
||||
})
|
||||
|
||||
if (!existing) {
|
||||
throw createApiError(404, SERVER_ERROR_CODES.COMMON_TARGET_NOT_FOUND, '配置项不存在')
|
||||
}
|
||||
|
||||
// 仅删除配置行,不触碰任何用户数据
|
||||
await db.delete(gradeClass).where(eq(gradeClass.id, id))
|
||||
|
||||
return {
|
||||
success: true,
|
||||
message: '配置项已删除'
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,25 @@
|
||||
import { defineEventHandler, getQuery } from 'h3'
|
||||
import { db } from '~/drizzle/db'
|
||||
import { gradeClass } from '~/drizzle/schema'
|
||||
import { eq } from 'drizzle-orm'
|
||||
import { createApiError } from '~~/server/utils/apiError'
|
||||
import { SERVER_ERROR_CODES } from '~~/server/config/constants'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
// 检查认证和权限
|
||||
const user = event.context.user
|
||||
if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
|
||||
throw createApiError(403, SERVER_ERROR_CODES.COMMON_INSUFFICIENT_PERMISSION, '没有权限访问')
|
||||
}
|
||||
|
||||
const grade = typeof getQuery(event).grade === 'string' ? getQuery(event).grade.trim() : ''
|
||||
if (!grade) {
|
||||
throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, '年级不能为空')
|
||||
}
|
||||
|
||||
await db.delete(gradeClass).where(eq(gradeClass.grade, grade))
|
||||
|
||||
return {
|
||||
success: true
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,50 @@
|
||||
import { defineEventHandler } from 'h3'
|
||||
import { and, eq, isNotNull, sql } from 'drizzle-orm'
|
||||
import { db } from '~/drizzle/db'
|
||||
import { gradeClass, users } from '~/drizzle/schema'
|
||||
import { smartSort } from '~~/server/utils/grade-class-core'
|
||||
import { createApiError } from '~~/server/utils/apiError'
|
||||
import { SERVER_ERROR_CODES } from '~~/server/config/constants'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
// 检查认证和权限
|
||||
const user = event.context.user
|
||||
if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
|
||||
throw createApiError(403, SERVER_ERROR_CODES.COMMON_INSUFFICIENT_PERMISSION, '没有权限访问')
|
||||
}
|
||||
|
||||
const [rows, counts] = await Promise.all([
|
||||
db.select().from(gradeClass),
|
||||
// 当前各年级班级的活跃用户数(用于管理界面人数展示)
|
||||
db
|
||||
.select({
|
||||
grade: users.grade,
|
||||
class: users.class,
|
||||
count: sql<number>`count(*)::int`
|
||||
})
|
||||
.from(users)
|
||||
.where(and(eq(users.status, 'active'), isNotNull(users.grade), isNotNull(users.class)))
|
||||
.groupBy(users.grade, users.class)
|
||||
])
|
||||
|
||||
const countMap = new Map(
|
||||
counts.map((row) => [`${row.grade}\u0000${row.class}`, row.count])
|
||||
)
|
||||
|
||||
const items = rows
|
||||
.map((item) => ({
|
||||
id: item.id,
|
||||
grade: item.grade,
|
||||
class: item.class,
|
||||
userCount: countMap.get(`${item.grade}\u0000${item.class}`) || 0
|
||||
}))
|
||||
.sort((a, b) => {
|
||||
const gradeResult = smartSort(a.grade, b.grade)
|
||||
return gradeResult || smartSort(a.class, b.class)
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
items
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,85 @@
|
||||
import { defineEventHandler, readBody } from 'h3'
|
||||
import { db } from '~/drizzle/db'
|
||||
import { gradeClass } from '~/drizzle/schema'
|
||||
import { createApiError } from '~~/server/utils/apiError'
|
||||
import { SERVER_ERROR_CODES } from '~~/server/config/constants'
|
||||
|
||||
const MAX_BATCH_SIZE = 500
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
// 检查认证和权限
|
||||
const user = event.context.user
|
||||
if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
|
||||
throw createApiError(403, SERVER_ERROR_CODES.COMMON_INSUFFICIENT_PERMISSION, '没有权限访问')
|
||||
}
|
||||
|
||||
const body = await readBody(event)
|
||||
|
||||
// 批量模式:items 数组,已存在的组合跳过,返回新增/跳过数量
|
||||
if (Array.isArray(body?.items)) {
|
||||
if (body.items.length > MAX_BATCH_SIZE) {
|
||||
throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, `单次批量最多 ${MAX_BATCH_SIZE} 项`)
|
||||
}
|
||||
|
||||
const pairs = body.items
|
||||
.map((item) => ({
|
||||
grade: typeof item?.grade === 'string' ? item.grade.trim() : '',
|
||||
class: typeof item?.class === 'string' ? item.class.trim() : ''
|
||||
}))
|
||||
.filter((item) => item.grade && item.class)
|
||||
|
||||
const seen = new Set<string>()
|
||||
const uniquePairs = pairs.filter((item) => {
|
||||
const key = `${item.grade}\u0000${item.class}`
|
||||
if (seen.has(key)) return false
|
||||
seen.add(key)
|
||||
return true
|
||||
})
|
||||
|
||||
if (uniquePairs.length === 0) {
|
||||
throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, '年级和班级不能为空')
|
||||
}
|
||||
|
||||
const existingRows = await db
|
||||
.select({ grade: gradeClass.grade, class: gradeClass.class })
|
||||
.from(gradeClass)
|
||||
const existingKeys = new Set(existingRows.map((row) => `${row.grade}\u0000${row.class}`))
|
||||
|
||||
const toInsert = uniquePairs.filter((item) => !existingKeys.has(`${item.grade}\u0000${item.class}`))
|
||||
const skipped = uniquePairs.length - toInsert.length
|
||||
|
||||
if (toInsert.length > 0) {
|
||||
// onConflictDoNothing 兜底并发下的唯一约束冲突(预查已跳过存量,此处防竞态)
|
||||
await db.insert(gradeClass).values(toInsert).onConflictDoNothing()
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
added: toInsert.length,
|
||||
skipped
|
||||
}
|
||||
}
|
||||
|
||||
// 单条模式(插入用 onConflictDoNothing 兜底并发唯一冲突,冲突返回 409)
|
||||
const grade = typeof body.grade === 'string' ? body.grade.trim() : ''
|
||||
const studentClass = typeof body.class === 'string' ? body.class.trim() : ''
|
||||
|
||||
if (!grade || !studentClass) {
|
||||
throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, '年级和班级不能为空')
|
||||
}
|
||||
|
||||
const inserted = (await db
|
||||
.insert(gradeClass)
|
||||
.values({ grade, class: studentClass })
|
||||
.onConflictDoNothing()
|
||||
.returning({ id: gradeClass.id, grade: gradeClass.grade, class: gradeClass.class }))[0]
|
||||
|
||||
if (!inserted) {
|
||||
throw createApiError(409, SERVER_ERROR_CODES.GRADE_CLASS_DUPLICATE, '该年级班级组合已存在')
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
item: inserted
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,64 @@
|
||||
import { defineEventHandler } from 'h3'
|
||||
import { and, eq, isNotNull } from 'drizzle-orm'
|
||||
import { db } from '~/drizzle/db'
|
||||
import { gradeClass, users } from '~/drizzle/schema'
|
||||
import { createApiError } from '~~/server/utils/apiError'
|
||||
import { SERVER_ERROR_CODES } from '~~/server/config/constants'
|
||||
|
||||
const MAX_BATCH_SIZE = 500
|
||||
|
||||
// 从现有用户提取年级班级组合并写入配置(仅 active 用户)
|
||||
export default defineEventHandler(async (event) => {
|
||||
// 检查认证和权限
|
||||
const user = event.context.user
|
||||
if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
|
||||
throw createApiError(403, SERVER_ERROR_CODES.COMMON_INSUFFICIENT_PERMISSION, '没有权限访问')
|
||||
}
|
||||
|
||||
const userCombos = await db
|
||||
.selectDistinct({
|
||||
grade: users.grade,
|
||||
class: users.class
|
||||
})
|
||||
.from(users)
|
||||
.where(and(eq(users.status, 'active'), isNotNull(users.grade), isNotNull(users.class)))
|
||||
|
||||
const pairs = userCombos
|
||||
.map((item) => ({
|
||||
grade: typeof item.grade === 'string' ? item.grade.trim() : '',
|
||||
class: typeof item.class === 'string' ? item.class.trim() : ''
|
||||
}))
|
||||
.filter((item) => item.grade && item.class)
|
||||
|
||||
const seen = new Set<string>()
|
||||
const uniquePairs = pairs.filter((item) => {
|
||||
const key = `${item.grade}\u0000${item.class}`
|
||||
if (seen.has(key)) return false
|
||||
seen.add(key)
|
||||
return true
|
||||
})
|
||||
|
||||
const existingRows = await db
|
||||
.select({ grade: gradeClass.grade, class: gradeClass.class })
|
||||
.from(gradeClass)
|
||||
const existingKeys = new Set(existingRows.map((row) => `${row.grade}\u0000${row.class}`))
|
||||
const toInsert = uniquePairs.filter((item) => !existingKeys.has(`${item.grade}\u0000${item.class}`))
|
||||
|
||||
let added = 0
|
||||
for (let i = 0; i < toInsert.length; i += MAX_BATCH_SIZE) {
|
||||
const batch = toInsert.slice(i, i + MAX_BATCH_SIZE)
|
||||
const inserted = await db
|
||||
.insert(gradeClass)
|
||||
.values(batch)
|
||||
.onConflictDoNothing()
|
||||
.returning({ id: gradeClass.id })
|
||||
added += inserted.length
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
total: uniquePairs.length,
|
||||
added,
|
||||
skipped: uniquePairs.length - added
|
||||
}
|
||||
})
|
||||
Reference in New Issue
Block a user