feat: 完善课表档案、课件归档、提醒与客户端更新并发布 1.4.1

- 重写课表档案工作区并合并时间表、课表与完整档案导入导出
- 修复课前/上下课提醒遮罩与通知收回冲突
- 增加课件文件夹分类、教师归档路径和客户端本机归档
- 打通客户端下载/安装/完成状态上报并在管理端展示更新过程
- 修复侧栏折叠裁切、课时多选与上传控件样式
- 统一版本到 1.4.1
This commit is contained in:
LoveChengke committed 2026-10-18 17:39:54 +08:00
1 parent 2612a912ef
commit 6347d1e5aa
59 files changed
+2251 -584

No files matched your search

@@ -2,6 +2,8 @@ import {
CLIENT_COMMAND_EXPIRE_MS,
CLIENT_COMMAND_LABELS,
CLIENT_ONLINE_WINDOW_MS,
compareVersions,
type ClientUpdateProgressDto,
type ClientUpdateMode,
type ClientCommandAckRequest,
type ClientCommandDto,
@@ -47,6 +49,7 @@ type DeviceRow = {
lastHeartbeatAt: Date | null;
lastIp: string;
stateNote: string;
updateProgress: string;
createdAt: Date;
updatedAt: Date;
class?: { id: string; name: string } | null;
@@ -153,6 +156,25 @@ export async function heartbeat(
})) as unknown as DeviceRow;
const targetVersion = device.updateTargetVersion.trim();
if (targetVersion && input.clientVersion && compareVersions(input.clientVersion, targetVersion) >= 0) {
await prisma.clientDevice.updateMany({
where: { id: device.id, updateTargetVersion: targetVersion },
data: {
pendingVersion: '',
updateProgress: JSON.stringify({
version: input.clientVersion,
stage: 'completed',
downloadedBytes: 0,
totalBytes: 0,
percent: 100,
error: '',
updatedAt: now.toISOString(),
}),
},
});
} else if (input.updateProgress && input.updateProgress.stage !== 'idle') {
await reportUpdateProgress(user, input.deviceKey, input.updateProgress);
}
const [command, update] = await Promise.all([
findPendingCommand(device.id, now),
targetVersion ? clientReleases.resolveUpdateInfo(targetVersion) : Promise.resolve(null),
@@ -176,6 +198,46 @@ export async function heartbeat(
};
}
export async function reportUpdateProgress(
user: TokenPayload,
deviceKey: string,
progress: ClientUpdateProgressDto,
) {
const device = await prisma.clientDevice.findUnique({ where: { deviceKey } });
// 教师/管理员电脑不绑定班级(会话与设备两侧都是 null),同样允许上报自己的进度。
if (!device || device.classId !== resolveClassId(user)) throw ApiError.forbidden('设备不属于当前班级');
// 已取消或更换目标的迟到进度不得覆盖当前任务。
if (progress.version !== device.updateTargetVersion || progress.stage === 'completed') return;
const previous = readUpdateProgress(device.updateProgress);
if (previous?.version === progress.version && previous.stage === 'completed') return;
const stages = ['idle', 'downloading', 'verifying', 'ready', 'waiting', 'installing', 'completed'];
if (
previous?.version === progress.version &&
previous.stage !== 'failed' &&
progress.stage !== 'failed' &&
!progress.error &&
stages.indexOf(progress.stage) < stages.indexOf(previous.stage)
)
return;
await prisma.clientDevice.updateMany({
where: {
id: device.id,
updateTargetVersion: progress.version,
updateProgress: device.updateProgress,
},
data: {
updateProgress: JSON.stringify({ ...progress, updatedAt: new Date().toISOString() }),
},
});
}
function readUpdateProgress(raw: string): ClientUpdateProgressDto | null {
try {
return raw ? JSON.parse(raw) : null;
} catch {
return null;
}
}
/** POST /api/clients/commands/:id/ack - 客户端执行完远控命令后的回执 */
export async function ackCommand(
commandId: string,
@@ -263,6 +325,7 @@ export async function listDevices(
lastHeartbeatAt: heartbeat ? heartbeat.toISOString() : null,
lastIp: row.lastIp,
stateNote: row.stateNote,
updateProgress: readUpdateProgress(row.updateProgress),
online: Boolean(heartbeat && now.getTime() - heartbeat.getTime() < CLIENT_ONLINE_WINDOW_MS),
pendingCommand: pending ? toCommandDto(pending) : null,
lastCommand: last ? toCommandDto(last) : null,
@@ -390,6 +453,7 @@ export async function pushUpdate(
where: { id: device.id },
data: {
updateTargetVersion: target,
updateProgress: '',
updateMode: clear ? 'idle' : input.mode,
updateNotBefore:
!clear && input.mode === 'after-school'