diff --git a/README.md b/README.md index abd26812..4fe9c164 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,14 @@ - Supabase/PostgreSQL 多租户数据库 schema、RLS、索引、触发器。 - `apps/api` 独立业务 API，后续供 H5、Taro 小程序、管理后台统一调用；已支持 Supabase Auth JWT 和迁移期 `tk_` session 双入口。 -- 租户后台能力：品牌、主题模板/草稿/发布、域名、公开设置、支付账户、登录配置、私密密钥掩码、活动内容、考试日期、题目反馈处理、用户站内通知查看、激活码、优惠券规则/核销报表、勋章管理/手动发放/签到积分反馈自动发放、成员权限、自定义角色模板、班级/教师/学生范围权限、学生批量导入、批量分班、学生备注、跟进任务、跟进效果统计、学习督导自动化预览/生成、学生批量 CRM 推送、审计日志。 +- 租户后台能力：品牌、主题模板/草稿/发布、域名、公开设置、支付账户、登录配置、私密密钥掩码、活动内容、考试日期、题目反馈处理、用户站内通知查看、激活码、优惠券规则/核销报表、勋章管理/手动发放/签到积分反馈自动发放、成员权限、自定义角色模板、班级/教师/学生范围权限、学生批量导入、批量分班、学生备注、跟进任务、跟进效果统计、学习督导自动化预览/生成、督导规则模板、学生批量 CRM 推送、审计日志。 - 租户内容能力：可配置题库入口、任意深度分类树、考试意向标记、题目集合、顺序/随机/全真模拟蓝图、题目录入/更新、视频绑定、分数线、单词、知识手册、资料资源台账、题目/单词/知识手册/分数线/视频 JSON/CSV/Excel 批量导入。 - 学生端能力：题库入口、分类树、题目集合、顺序/随机/模考 session 组卷快照、答题、错题本、收藏夹、背单词卡片学习/发音/收藏练习、个人中心、男女默认预设头像、站内通知、勋章、考试倒计时、签到积分、积分活动任务、积分兑换、题目反馈、排行榜接口（租户默认关闭）、分数线、AI 择校推荐、题目视频、订单详情/状态轮询、优惠券领取/抵扣、权益、激活码预检查/兑换、资料下载；签到、积分阈值、反馈解决和积分活动可返回自动获得勋章结果，反馈处理/奖励、勋章发放和积分兑换会写入用户站内通知。学生头像不支持上传或第三方头像落库，学生激励默认以勋章自动发放为主，不默认启用排行榜。 - 平台后台能力：租户管理、租户详情、账务资料维护、平台员工创建/授权/启停、平台细粒度权限点、平台审计日志查询和 CSV/JSON 导出、平台审计告警规则/开放告警查询/确认/解决、平台审计告警外部通知渠道和发送事件、SaaS 套餐、订阅、订阅账单候选预览/dry-run/批量生成、自动计费 worker、账单、服务费收款、逾期标记、内部催缴台账、平台催缴外部通知渠道和发送事件、用量记录、公共题库授权。 - 公共题库商业化能力：租户可采纳平台授权题库为本租户副本，并可手动或由 worker 自动同步平台新增/更新题目；同步会保护租户自改题目，返回冲突而不覆盖，后台可查询冲突明细；worker 失败会生成租户 `public_question_bank_sync_failed` 通知，恢复成功自动关闭失败通知，平台可用 `/api/platform-admin/question-bank-sync-status` 按 `platform:question_bank:ops` 查看跨租户同步运营摘要。 - 题库导出能力：租户内容编辑可按题目集合、内容入口或分类节点导出 JSON、`paper_json`、打印 payload、PDF、Word 和每日一练图片 ZIP 素材包，后端强制租户隔离、答案/解析开关、复合题子题脱敏、导出 job 和审计；PDF/Word/ZIP 由 exports worker 生成水印文件或运营素材并发布到 `content_assets`；`daily_practice` 支持每日一练九宫格 metadata、PDF/Word 版式、9 张 PNG/SVG 卡片和拼图包。 - 销售/代理/CRM 增长链路：邀请码、扫码/分享事件、首绑客资保护、销售统计、团队关系、CRM 配置、跟进分配策略、客资队列和学生批量 CRM 跟进推送。 -- `apps/worker` 后台任务进程：CRM webhook 队列消费、`lead.created` 客资事件、`student.crm_push` 学生跟进事件、generic/钉钉/飞书/企微机器人发送、签名、失败重试和日志；commerce worker 可补偿查询微信/支付宝支付和退款状态；provider-bills worker 可下载微信/支付宝官方账单并导入资金对账；platform-billing worker 可自动为即将到期且未开票的 SaaS 订阅生成服务费账单并写审计；platform-dunning worker 可扫描逾期未结清服务费账单、标记 overdue、写内部催缴记录和审计；platform-dunning-notifications worker 可把内部催缴记录按平台渠道推送到 generic/钉钉/飞书/企微 webhook，并记录幂等发送事件；platform-audit-alerts worker 可把高风险平台审计动作转换为内部告警并递归脱敏告警 details；platform-audit-notifications worker 可把开放审计告警按平台渠道推送到 generic/钉钉/飞书/企微 webhook，并记录幂等发送事件；assets worker 可复检托管资源元数据、执行内置安全扫描并自动下架异常资源；imports worker 可执行大批量导入；public-banks worker 可自动同步公共题库采纳副本；exports worker 可渲染 PDF/Word 导出文件和每日一练 ZIP 图片素材包。 +- `apps/worker` 后台任务进程：CRM webhook 队列消费、`lead.created` 客资事件、`student.crm_push` 学生跟进事件、generic/钉钉/飞书/企微机器人发送、签名、失败重试和日志；student-supervision worker 可按租户督导规则模板定时生成学习跟进任务；commerce worker 可补偿查询微信/支付宝支付和退款状态；provider-bills worker 可下载微信/支付宝官方账单并导入资金对账；platform-billing worker 可自动为即将到期且未开票的 SaaS 订阅生成服务费账单并写审计；platform-dunning worker 可扫描逾期未结清服务费账单、标记 overdue、写内部催缴记录和审计；platform-dunning-notifications worker 可把内部催缴记录按平台渠道推送到 generic/钉钉/飞书/企微 webhook，并记录幂等发送事件；platform-audit-alerts worker 可把高风险平台审计动作转换为内部告警并递归脱敏告警 details；platform-audit-notifications worker 可把开放审计告警按平台渠道推送到 generic/钉钉/飞书/企微 webhook，并记录幂等发送事件；assets worker 可复检托管资源元数据、执行内置安全扫描并自动下架异常资源；imports worker 可执行大批量导入；public-banks worker 可自动同步公共题库采纳副本；exports worker 可渲染 PDF/Word 导出文件和每日一练 ZIP 图片素材包。 - 销售/代理分佣结算基础闭环：租户默认比例、成员比例、激活码批次比例、订单/激活码归因、结算单生成、审核、线下打款状态、CSV/JSON 导出、打款凭证登记/复核和权限隔离。 - 订单售后基础闭环：退款请求、审核、处理状态流、微信/支付宝发起退款、微信/支付宝退款查询确认、微信/支付宝退款通知 webhook、退款金额累计、部分/全额退款订单状态、全额退款权益撤销、退款事件和审计日志。 - 资金对账、异常订单和财务凭证闭环：租户财务/运营可通过 `/api/commerce/reconciliation/*` 导入或预览支付/退款账单行，也可创建微信/支付宝官方账单下载任务；后端按租户隔离比对本地订单、支付、退款记录，识别已匹配、金额不一致、状态不一致、供应商有本地无、本地有供应商无、重复行和无效行，并写入对账批次、明细和审计日志；异常明细可创建差错工单，支持分配、开始处理、升级、解决、忽略、重开和事件留痕；`/api/commerce/operations/anomalies` 聚合异常订单风险，`/api/commerce/adjustment-vouchers*` 支持人工调整凭证、复核、事件轨迹和报表。工单和凭证只做财务审核闭环，不直接修改订单、支付、退款或权益。 @@ -35,7 +35,7 @@ - 题库导出已完成服务端结构化 payload、PDF/Word 二进制 worker、每日一练基础导出和每日一练 ZIP 图片素材包；后续还要补更精细试卷模板、多模板排版和导出操作台体验。 - 优惠券复杂规则和核销报表已可联调，包含状态启停、活动分组、最低订单金额、优惠封顶、单用户限次、首单限制、适用套餐/地区、核销明细和活动报表；Taro 租户营销中心已接优惠券规则表单、筛选、核销明细和报表第一版。 - 勋章管理、手动发放、签到连续天数、积分阈值、反馈解决、积分活动任务、练习次数、单词掌握和模考成绩系统触发勋章已可联调；积分活动任务、积分兑换商品、兑换订单、优惠券兑换履约、租户后台配置和用户站内通知第一版已完成，Taro 学生个人中心已接积分任务/兑换/积分明细和消息中心第一版，租户营销中心已接积分任务/兑换操作台和用户通知查看第一版。学生激励默认以后台配置勋章自动发放为主，排行榜默认不开启也不在学生端默认请求。后续还要补更细活动效果看板、外部微信订阅消息/短信推送、分佣真实打款 provider、发票、批量凭证上传、CRM 富卡片模板、失败告警、死信运营台、销售转化看板、公共题库版本通知和冲突处理操作台。 -- `apps/taro` 已建立 Taro 4 React 跨端前端地基，包含 H5 学生端、租户后台、平台后台三套构建入口、租户解析、统一 API client 和 Supabase Auth client 初始化；学生端第一批页面已接入登录、首页、题库、练习、背单词、知识手册、分数线、AI 择校推荐、资料和个人中心，已新增 `RichContent` 安全渲染组件用于题干、选项、解析、知识手册和逐题复盘，H5 端已用 KaTeX 渲染 `$...$`、`$$...$$`、`\(...\)`、`\[...\]` 公式，私有题图可用 `asset:`/`content_asset:` 资源引用走短期预览签名，已升级背单词为今日计划/单元学习/收藏练习、卡片翻转、发音、美/英音切换和本地位置恢复第一版，资料页已补齐预览/下载的短签名、水印 traceId 和强制水印容器第一版，个人中心已接学习报告、14 天趋势、题型表现、最近练习、积分任务/兑换/积分明细和消息中心第一版；学生端不默认请求排行榜，仅在租户显式开启 `enableLeaderboard` 并完成压测后进入独立排行榜页或活动页；租户后台第一批页面已接入工作台、数据看板、学生/班级、题库内容、营销中心、财务运营和租户设置，学生运营页已接跟进看板、学习督导自动化和批量 CRM 推送第一版，营销中心已接 CRM、分佣结算、优惠券规则/核销报表、积分任务/兑换操作台和用户通知查看第一版，财务运营已接退款状态机、官方账单任务、对账异常、差错工单和调整凭证第一版，设置页已接主题模板、草稿预览/发布、角色模板和成员绑定第一版；平台后台已接入工作台、租户管理、账务中心、公共题库授权、平台员工管理，以及创建租户、租户详情、状态变更、账务资料维护、平台员工创建/编辑/禁用恢复、权限点勾选、平台审计查询/CSV 导出、开放审计告警确认/解决、审计告警外部通知渠道/事件状态摘要、订阅、订阅账单候选/dry-run/批量生成、自动计费 worker 生成结果查看、收款、逾期预览/催缴记录、催缴外部通知渠道/事件摘要、用量和题库授权第一版写操作。 +- `apps/taro` 已建立 Taro 4 React 跨端前端地基，包含 H5 学生端、租户后台、平台后台三套构建入口、租户解析、统一 API client 和 Supabase Auth client 初始化；学生端第一批页面已接入登录、首页、题库、练习、背单词、知识手册、分数线、AI 择校推荐、资料和个人中心，已新增 `RichContent` 安全渲染组件用于题干、选项、解析、知识手册和逐题复盘，H5 端已用 KaTeX 渲染 `$...$`、`$$...$$`、`\(...\)`、`\[...\]` 公式，私有题图可用 `asset:`/`content_asset:` 资源引用走短期预览签名，已升级背单词为今日计划/单元学习/收藏练习、卡片翻转、发音、美/英音切换和本地位置恢复第一版，资料页已补齐预览/下载的短签名、水印 traceId 和强制水印容器第一版，个人中心已接学习报告、14 天趋势、题型表现、最近练习、积分任务/兑换/积分明细和消息中心第一版；学生端不默认请求排行榜，仅在租户显式开启 `enableLeaderboard` 并完成压测后进入独立排行榜页或活动页；租户后台第一批页面已接入工作台、数据看板、学生/班级、题库内容、营销中心、财务运营和租户设置，学生运营页已接跟进看板、学习督导自动化、督导规则保存和批量 CRM 推送第一版，营销中心已接 CRM、分佣结算、优惠券规则/核销报表、积分任务/兑换操作台和用户通知查看第一版，财务运营已接退款状态机、官方账单任务、对账异常、差错工单和调整凭证第一版，设置页已接主题模板、草稿预览/发布、角色模板和成员绑定第一版；平台后台已接入工作台、租户管理、账务中心、公共题库授权、平台员工管理，以及创建租户、租户详情、状态变更、账务资料维护、平台员工创建/编辑/禁用恢复、权限点勾选、平台审计查询/CSV 导出、开放审计告警确认/解决、审计告警外部通知渠道/事件状态摘要、订阅、订阅账单候选/dry-run/批量生成、自动计费 worker 生成结果查看、收款、逾期预览/催缴记录、催缴外部通知渠道/事件摘要、用量和题库授权第一版写操作。 - 根目录已清理为新 Supabase SaaS monorepo 编排层；旧 PocketBase/React 项目和旧构建产物仅保留在 `参考/` 目录作为迁移参考，不进入 Git 提交。 更完整的进度看这些文档： @@ -281,6 +281,21 @@ npm --workspace @tiku-saas/worker run imports:once npm --workspace @tiku-saas/worker run public-banks:once ``` +单次运行学习督导规则 worker： + +```bash +npm run build:worker +node apps/worker/dist/apps/worker/src/index.js --once --job student-supervision +``` + +生产定时任务建议每 15 到 60 分钟运行一次 `node dist/apps/worker/src/index.js --once --job student-supervision`。它只处理启用状态的租户学习督导规则，按规则阈值扫描未学习、错题积压、低正确率、单词待复习和超期未完成练习的学生，并幂等生成 `learning` 跟进任务；教师/班主任范围规则必须绑定班级，生成结果、失败原因和 worker 信息会写入规则 `last_result/metadata` 与审计。 + +```text +WORKER_STUDENT_SUPERVISION_BATCH_SIZE=20 +WORKER_STUDENT_SUPERVISION_ID=student-supervision-prod-1 +WORKER_STUDENT_SUPERVISION_CLAIM_STALE_SECONDS=900 +``` + 单次运行题库 PDF/Word/每日一练 ZIP 导出 worker： ```bash @@ -343,6 +358,7 @@ npm run test:worker:assets npm run test:worker:exports npm run test:worker:imports npm run test:worker:public-banks +npm run test:worker:student-supervision npm run test:rls ``` diff --git a/apps/api/src/features/tenant-admin/classes.ts b/apps/api/src/features/tenant-admin/classes.ts index 07dab5b4..15136ae8 100644 --- a/apps/api/src/features/tenant-admin/classes.ts +++ b/apps/api/src/features/tenant-admin/classes.ts @@ -9,6 +9,18 @@ import { requireTenantPermission, type TenantAdminAuth, } from './auth.js'; +import { + defaultSupervisionDueAt, + ensureReadableSupervisionClass, + generateStudentSupervisionFollowups, + loadStudentSupervisionCandidates, + MAX_SUPERVISION_GENERATE, + nextSupervisionRunAt, + parseSupervisionSchedule, + parseSupervisionRules, + scopedSupervisionClassIds, + supervisionBatchKey, +} from './supervision.js'; type JsonBody = Record; @@ -21,27 +33,17 @@ const STUDENT_NOTE_VISIBILITIES = ['tenant_staff', 'class_staff', 'author_only'] const STUDENT_FOLLOWUP_TYPES = ['learning', 'service', 'sales', 'renewal', 'risk', 'custom']; const STUDENT_FOLLOWUP_PRIORITIES = ['low', 'normal', 'high', 'urgent']; const STUDENT_FOLLOWUP_STATUSES = ['open', 'in_progress', 'done', 'cancelled']; +const STUDENT_SUPERVISION_RULE_STATUSES = ['active', 'disabled', 'archived']; const FOLLOWUP_REPORT_RANGES: Record = { '7d': 7, '30d': 30, '90d': 90 }; const MAX_BULK_STUDENTS = 200; const MAX_BULK_CLASS_ASSIGNMENTS = 500; const MAX_BULK_CRM_PUSH = 100; -const MAX_SUPERVISION_GENERATE = 100; const CRM_ASSIGNABLE_ROLES = ['tenant_owner', 'tenant_admin', 'tenant_operator', 'teacher', 'sales', 'agent']; const STUDENT_AVATAR_FIELD_KEYS = ['avatarUrl', 'avatar_url', 'avatar', 'headimgurl', 'headImgUrl', 'figureurl', 'figureurl_qq_1', 'figureurl_qq_2']; const STUDENT_PRIMARY_ROLE_FIELD_KEYS = ['primaryRole', 'primary_role']; const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i; const DATE_KEY_PATTERN = /^\d{4}-\d{2}-\d{2}$/; -const SUPERVISION_RULE_DEFAULTS = { - windowDays: 14, - inactivityDays: 7, - minAnswers: 10, - lowAccuracyThreshold: 0.6, - wrongQuestionThreshold: 5, - vocabularyDueThreshold: 20, - staleSessionDays: 3, -}; - const shanghaiDateFormatter = new Intl.DateTimeFormat('en-US', { timeZone: 'Asia/Shanghai', year: 'numeric', @@ -115,11 +117,6 @@ function numberValue(value: unknown, fallback = 0) { return Number.isFinite(parsed) ? parsed : fallback; } -function boundedNumberValue(value: unknown, fallback: number, min: number, max: number) { - const parsed = numberValue(value, fallback); - return Math.max(min, Math.min(max, parsed)); -} - function ratio(numerator: number, denominator: number) { if (denominator <= 0) return 0; return Number((numerator / denominator).toFixed(4)); @@ -202,10 +199,6 @@ function isValidShanghaiDateKey(dateKey: string) { return Number.isFinite(date.getTime()) && shanghaiDateKey(date) === dateKey; } -function shanghaiTodayKey() { - return shanghaiDateKey(new Date()); -} - function daysBetweenInclusive(startDate: string, endDate: string) { const start = Date.parse(`${startDate}T00:00:00+08:00`); const end = Date.parse(`${endDate}T00:00:00+08:00`); @@ -246,48 +239,6 @@ function parseFollowupReportRange(timeRangeValue: string, startDateValue: string }; } -interface SupervisionRuleConfig { - windowDays: number; - inactivityDays: number; - minAnswers: number; - lowAccuracyThreshold: number; - wrongQuestionThreshold: number; - vocabularyDueThreshold: number; - staleSessionDays: number; -} - -function parseSupervisionRules(value: unknown): SupervisionRuleConfig { - const raw = objectValue(value); - return { - windowDays: boundedIntValue(raw.windowDays, SUPERVISION_RULE_DEFAULTS.windowDays, 3, 90), - inactivityDays: boundedIntValue(raw.inactivityDays, SUPERVISION_RULE_DEFAULTS.inactivityDays, 1, 90), - minAnswers: boundedIntValue(raw.minAnswers, SUPERVISION_RULE_DEFAULTS.minAnswers, 1, 500), - lowAccuracyThreshold: boundedNumberValue(raw.lowAccuracyThreshold, SUPERVISION_RULE_DEFAULTS.lowAccuracyThreshold, 0.1, 0.95), - wrongQuestionThreshold: boundedIntValue(raw.wrongQuestionThreshold, SUPERVISION_RULE_DEFAULTS.wrongQuestionThreshold, 1, 200), - vocabularyDueThreshold: boundedIntValue(raw.vocabularyDueThreshold, SUPERVISION_RULE_DEFAULTS.vocabularyDueThreshold, 1, 1000), - staleSessionDays: boundedIntValue(raw.staleSessionDays, SUPERVISION_RULE_DEFAULTS.staleSessionDays, 1, 30), - }; -} - -function supervisionBatchKey(value: unknown) { - const candidate = nullableString(value); - if (!candidate) return `manual:${shanghaiTodayKey()}`; - return candidate.length <= 120 ? candidate : createHash('sha256').update(candidate).digest('hex'); -} - -function defaultSupervisionDueAt() { - const date = new Date(); - date.setDate(date.getDate() + 1); - date.setHours(18, 0, 0, 0); - return date.toISOString(); -} - -function supervisionPriority(score: number) { - if (score >= 90) return 'urgent'; - if (score >= 60) return 'high'; - return 'normal'; -} - function classCodeValue(value: unknown) { const code = nullableString(value); if (!code) return null; @@ -417,295 +368,6 @@ async function ensureStudentInScope(auth: TenantAdminAuth, studentUserId: string } } -async function loadStudentSupervisionCandidates(auth: TenantAdminAuth, input: { - rules: SupervisionRuleConfig; - classId: string | null; - assignedToUserId: string | null; - studentUserIds?: string[]; - limit: number; -}) { - const scopedIds = await scopedClassIds(auth); - const params: unknown[] = [auth.tenantId, input.rules.windowDays, input.rules.staleSessionDays]; - const filters = [ - 'tm.tenant_id = $1', - `tm.role = 'student'`, - `tm.status = 'active'`, - ]; - - if (input.classId) { - params.push(input.classId); - filters.push(`exists ( - select 1 from public.tenant_class_members scoped_cm - where scoped_cm.tenant_id = tm.tenant_id - and scoped_cm.user_id = tm.user_id - and scoped_cm.class_id = $${params.length}::uuid - and scoped_cm.member_type = 'student' - and scoped_cm.status = 'active' - )`); - } - if (scopedIds) { - params.push(scopedIds); - filters.push(`exists ( - select 1 from public.tenant_class_members scoped_cm - where scoped_cm.tenant_id = tm.tenant_id - and scoped_cm.user_id = tm.user_id - and scoped_cm.class_id = any($${params.length}::uuid[]) - and scoped_cm.member_type = 'student' - and scoped_cm.status = 'active' - )`); - } - if (input.studentUserIds?.length) { - params.push(input.studentUserIds); - filters.push(`tm.user_id = any($${params.length}::uuid[])`); - } - - params.push(input.limit); - const rows = await query>( - ` - with student_scope as ( - select tm.tenant_id, tm.user_id, tm.created_at - from public.tenant_memberships tm - where ${filters.join(' and ')} - ), - class_agg as ( - select tcm.tenant_id, tcm.user_id, - min(tcm.class_id::text) as "defaultClassId", - jsonb_agg( - jsonb_build_object('classId', tc.id, 'className', tc.name, 'classCode', tc.code) - order by tc.sort_order asc, tc.created_at desc - ) filter (where tcm.status = 'active') as classes - from public.tenant_class_members tcm - join public.tenant_classes tc on tc.tenant_id = tcm.tenant_id and tc.id = tcm.class_id - join student_scope ss on ss.tenant_id = tcm.tenant_id and ss.user_id = tcm.user_id - where tcm.member_type = 'student' - and tcm.status = 'active' - group by tcm.tenant_id, tcm.user_id - ), - answers as ( - select ar.tenant_id, ar.user_id, - count(*) filter (where ar.answered_at >= now() - ($2::int * interval '1 day'))::int as "answerCount", - count(*) filter (where ar.answered_at >= now() - ($2::int * interval '1 day') and ar.is_correct is true)::int as "correctCount", - count(*) filter (where ar.answered_at >= now() - ($2::int * interval '1 day') and ar.is_correct is false)::int as "wrongAnswerCount", - max(ar.answered_at) as "latestAnsweredAt" - from public.answer_records ar - join student_scope ss on ss.tenant_id = ar.tenant_id and ss.user_id = ar.user_id - group by ar.tenant_id, ar.user_id - ), - wrongs as ( - select wq.tenant_id, wq.user_id, - count(*) filter (where wq.resolved_at is null)::int as "unresolvedWrongQuestions", - coalesce(sum(wq.wrong_count) filter (where wq.resolved_at is null), 0)::int as "wrongQuestionAttempts", - max(wq.last_wrong_at) filter (where wq.resolved_at is null) as "latestWrongAt" - from public.wrong_questions wq - join student_scope ss on ss.tenant_id = wq.tenant_id and ss.user_id = wq.user_id - group by wq.tenant_id, wq.user_id - ), - sessions as ( - select ps.tenant_id, ps.user_id, - count(*) filter ( - where ps.finished_at is null - and ps.started_at <= now() - ($3::int * interval '1 day') - and (ps.expires_at is null or ps.expires_at > now()) - )::int as "staleActiveSessions", - max(ps.started_at) as "latestSessionAt" - from public.practice_sessions ps - join student_scope ss on ss.tenant_id = ps.tenant_id and ss.user_id = ps.user_id - group by ps.tenant_id, ps.user_id - ), - reports as ( - select pr.tenant_id, pr.user_id, - max(pr.submitted_at) as "latestReportAt", - min(pr.accuracy) filter (where pr.submitted_at >= now() - ($2::int * interval '1 day')) as "lowestReportAccuracy", - max(pr.score) filter (where pr.submitted_at >= now() - ($2::int * interval '1 day')) as "bestReportScore" - from public.practice_session_reports pr - join student_scope ss on ss.tenant_id = pr.tenant_id and ss.user_id = pr.user_id - group by pr.tenant_id, pr.user_id - ), - vocab as ( - select uwp.tenant_id, uwp.user_id, - count(*) filter ( - where uwp.status in ('new', 'learning', 'reviewing') - and (uwp.next_review_date is null or uwp.next_review_date <= now()) - )::int as "dueVocabularyWords", - count(*) filter (where uwp.status = 'mastered')::int as "masteredVocabularyWords", - max(uwp.last_review_date) as "latestVocabularyReviewAt" - from public.user_word_progress uwp - join student_scope ss on ss.tenant_id = uwp.tenant_id and ss.user_id = uwp.user_id - group by uwp.tenant_id, uwp.user_id - ) - select ss.user_id as "studentUserId", - u.username, u.name, u.email::text as email, - case when ${canSeeStudentPhone(auth) ? 'true' : 'false'} then u.phone else null end as "studentPhone", - sp.region_id as "regionId", r.name as "regionName", - sp.selected_school_id as "selectedSchoolId", school.name as "selectedSchoolName", - sp.selected_major_id as "selectedMajorId", major.name as "selectedMajorName", - coalesce(sp.mastered_words_count, 0)::int as "profileMasteredWords", - coalesce(ca."defaultClassId", null) as "defaultClassId", - coalesce(ca.classes, '[]'::jsonb) as classes, - coalesce(a."answerCount", 0)::int as "answerCount", - coalesce(a."correctCount", 0)::int as "correctCount", - coalesce(a."wrongAnswerCount", 0)::int as "wrongAnswerCount", - a."latestAnsweredAt", - coalesce(w."unresolvedWrongQuestions", 0)::int as "unresolvedWrongQuestions", - coalesce(w."wrongQuestionAttempts", 0)::int as "wrongQuestionAttempts", - w."latestWrongAt", - coalesce(s."staleActiveSessions", 0)::int as "staleActiveSessions", - s."latestSessionAt", - rep."latestReportAt", - rep."lowestReportAccuracy", - rep."bestReportScore", - coalesce(v."dueVocabularyWords", 0)::int as "dueVocabularyWords", - coalesce(v."masteredVocabularyWords", 0)::int as "masteredVocabularyWords", - v."latestVocabularyReviewAt" - from student_scope ss - join public.platform_users u on u.id = ss.user_id - left join public.student_profiles sp on sp.tenant_id = ss.tenant_id and sp.user_id = ss.user_id - left join public.regions r on r.tenant_id = ss.tenant_id and r.id = sp.region_id - left join public.schools school on school.tenant_id = ss.tenant_id and school.id = sp.selected_school_id - left join public.majors major on major.tenant_id = ss.tenant_id and major.id = sp.selected_major_id - left join class_agg ca on ca.tenant_id = ss.tenant_id and ca.user_id = ss.user_id - left join answers a on a.tenant_id = ss.tenant_id and a.user_id = ss.user_id - left join wrongs w on w.tenant_id = ss.tenant_id and w.user_id = ss.user_id - left join sessions s on s.tenant_id = ss.tenant_id and s.user_id = ss.user_id - left join reports rep on rep.tenant_id = ss.tenant_id and rep.user_id = ss.user_id - left join vocab v on v.tenant_id = ss.tenant_id and v.user_id = ss.user_id - order by coalesce(a."latestAnsweredAt", s."latestSessionAt", v."latestVocabularyReviewAt", ss.created_at) asc nulls first - limit $${params.length} - `, - params, - ); - - return rows.map(row => buildSupervisionCandidate(row, input.rules, { - assignedToUserId: input.assignedToUserId, - classId: input.classId, - })).filter(Boolean) as Record[]; -} - -function buildSupervisionCandidate( - row: Record, - rules: SupervisionRuleConfig, - options: { assignedToUserId: string | null; classId: string | null }, -) { - const answerCount = intValue(row.answerCount, 0); - const correctCount = intValue(row.correctCount, 0); - const unresolvedWrongQuestions = intValue(row.unresolvedWrongQuestions, 0); - const staleActiveSessions = intValue(row.staleActiveSessions, 0); - const dueVocabularyWords = intValue(row.dueVocabularyWords, 0); - const latestStudyAt = latestIso([ - row.latestAnsweredAt, - row.latestSessionAt, - row.latestVocabularyReviewAt, - row.latestReportAt, - ]); - const inactiveDays = latestStudyAt ? Math.floor((Date.now() - new Date(latestStudyAt).getTime()) / 86_400_000) : null; - const accuracy = answerCount > 0 ? correctCount / answerCount : null; - const reasons: Array> = []; - let riskScore = 0; - - if (inactiveDays === null || inactiveDays >= rules.inactivityDays) { - const score = inactiveDays === null ? 35 : Math.min(55, inactiveDays * 5); - riskScore += score; - reasons.push({ - code: 'inactive', - label: inactiveDays === null ? '未产生学习记录' : `${inactiveDays} 天未学习`, - severity: inactiveDays === null || inactiveDays >= rules.inactivityDays * 2 ? 'high' : 'medium', - value: inactiveDays, - threshold: rules.inactivityDays, - }); - } - - if (unresolvedWrongQuestions >= rules.wrongQuestionThreshold) { - riskScore += Math.min(45, unresolvedWrongQuestions * 4); - reasons.push({ - code: 'wrong_backlog', - label: `未解决错题 ${unresolvedWrongQuestions} 道`, - severity: unresolvedWrongQuestions >= rules.wrongQuestionThreshold * 2 ? 'high' : 'medium', - value: unresolvedWrongQuestions, - threshold: rules.wrongQuestionThreshold, - }); - } - - if (answerCount >= rules.minAnswers && accuracy !== null && accuracy < rules.lowAccuracyThreshold) { - riskScore += Math.round((rules.lowAccuracyThreshold - accuracy) * 100); - reasons.push({ - code: 'low_accuracy', - label: `近 ${rules.windowDays} 天正确率 ${Math.round(accuracy * 100)}%`, - severity: accuracy < rules.lowAccuracyThreshold * 0.75 ? 'high' : 'medium', - value: Number(accuracy.toFixed(4)), - threshold: rules.lowAccuracyThreshold, - }); - } - - if (dueVocabularyWords >= rules.vocabularyDueThreshold) { - riskScore += Math.min(35, Math.ceil(dueVocabularyWords / Math.max(1, rules.vocabularyDueThreshold)) * 10); - reasons.push({ - code: 'vocabulary_due', - label: `待复习单词 ${dueVocabularyWords} 个`, - severity: dueVocabularyWords >= rules.vocabularyDueThreshold * 2 ? 'high' : 'medium', - value: dueVocabularyWords, - threshold: rules.vocabularyDueThreshold, - }); - } - - if (staleActiveSessions > 0) { - riskScore += Math.min(25, staleActiveSessions * 10); - reasons.push({ - code: 'stale_session', - label: `存在 ${staleActiveSessions} 个未完成练习`, - severity: 'medium', - value: staleActiveSessions, - threshold: 1, - }); - } - - if (!reasons.length) return null; - const priority = supervisionPriority(riskScore); - const studentName = nullableString(row.name) || nullableString(row.username) || nullableString(row.studentPhone) || String(row.studentUserId); - const primaryReason = String(reasons[0]?.label || '学习状态需要跟进'); - const classId = options.classId || nullableString(row.defaultClassId); - return { - studentUserId: row.studentUserId, - studentName, - studentPhone: row.studentPhone, - assignedToUserId: options.assignedToUserId, - classId, - classes: row.classes, - title: `学习督导：${primaryReason}`, - description: reasons.map(item => item.label).join('；'), - followupType: 'learning', - priority, - riskScore: Math.min(100, Math.round(riskScore)), - reasons, - evidence: { - windowDays: rules.windowDays, - answerCount, - correctCount, - wrongAnswerCount: intValue(row.wrongAnswerCount, 0), - accuracy: accuracy === null ? null : Number(accuracy.toFixed(4)), - latestStudyAt, - inactiveDays, - unresolvedWrongQuestions, - wrongQuestionAttempts: intValue(row.wrongQuestionAttempts, 0), - staleActiveSessions, - dueVocabularyWords, - masteredVocabularyWords: intValue(row.masteredVocabularyWords, 0), - latestWrongAt: row.latestWrongAt || null, - latestReportAt: row.latestReportAt || null, - lowestReportAccuracy: row.lowestReportAccuracy === null || row.lowestReportAccuracy === undefined ? null : numberValue(row.lowestReportAccuracy, 0), - bestReportScore: row.bestReportScore === null || row.bestReportScore === undefined ? null : numberValue(row.bestReportScore, 0), - latestVocabularyReviewAt: row.latestVocabularyReviewAt || null, - }, - }; -} - -function latestIso(values: unknown[]) { - const timestamps = values - .map(value => (typeof value === 'string' || value instanceof Date ? new Date(value).getTime() : NaN)) - .filter(Number.isFinite); - if (!timestamps.length) return null; - return new Date(Math.max(...timestamps)).toISOString(); -} - async function ensureUserTenantMembership( client: pg.PoolClient, tenantId: string, @@ -2128,7 +1790,7 @@ export async function tenantStudentSupervisionPreviewRoute(ctx: RequestContext) const limit = intParam(ctx, 'limit', 20, 100); const classId = stringParam(ctx, 'classId') || null; const assignedToUserId = stringParam(ctx, 'assignedToUserId') || null; - if (classId) await ensureReadableClass(auth, classId); + if (classId) await ensureReadableSupervisionClass(auth, classId); if (assignedToUserId) { await query( ` @@ -2160,7 +1822,7 @@ export async function tenantStudentSupervisionPreviewRoute(ctx: RequestContext) filters: { classId, assignedToUserId, - scoped: (await scopedClassIds(auth)) !== null, + scoped: (await scopedSupervisionClassIds(auth)) !== null, }, totalCandidates: candidates.length, candidates, @@ -2168,6 +1830,141 @@ export async function tenantStudentSupervisionPreviewRoute(ctx: RequestContext) }; } +export async function tenantStudentSupervisionRulesRoute(ctx: RequestContext) { + const auth = await requireTenantAdmin(ctx); + requireTenantPermission(auth, 'students:supervision:read'); + const limit = intParam(ctx, 'limit', 50, 200); + const status = stringParam(ctx, 'status'); + const params: unknown[] = [auth.tenantId]; + const filters = ['sr.tenant_id = $1']; + + if (status) { + if (!STUDENT_SUPERVISION_RULE_STATUSES.includes(status)) { + throw new HttpError(400, `Invalid supervision rule status: ${status}`, 'INVALID_SUPERVISION_RULE_STATUS'); + } + params.push(status); + filters.push(`sr.status = $${params.length}`); + } else { + filters.push(`sr.status <> 'archived'`); + } + + const scopedIds = await scopedSupervisionClassIds(auth); + if (scopedIds) { + params.push(scopedIds); + filters.push(`sr.class_id = any($${params.length}::uuid[])`); + } + params.push(limit); + + const items = await query( + ` + select sr.id, sr.name, sr.status, sr.rules, sr.schedule, + sr.class_id as "classId", tc.name as "className", tc.code as "classCode", + sr.assigned_to_user_id as "assignedToUserId", u.name as "assignedToName", u.username as "assignedToUsername", + sr.limit_count as "limit", sr.metadata, + sr.last_run_at as "lastRunAt", sr.next_run_at as "nextRunAt", sr.last_result as "lastResult", + sr.created_by as "createdBy", sr.updated_by as "updatedBy", + sr.created_at as "createdAt", sr.updated_at as "updatedAt" + from public.tenant_student_supervision_rules sr + left join public.tenant_classes tc on tc.tenant_id = sr.tenant_id and tc.id = sr.class_id + left join public.platform_users u on u.id = sr.assigned_to_user_id + where ${filters.join(' and ')} + order by case sr.status when 'active' then 1 when 'disabled' then 2 else 3 end, + sr.next_run_at asc nulls last, sr.created_at desc + limit $${params.length} + `, + params, + ); + + return { items, scoped: scopedIds !== null }; +} + +export async function upsertTenantStudentSupervisionRuleRoute(ctx: RequestContext) { + const auth = await requireTenantAdmin(ctx); + requireTenantPermission(auth, 'students:supervision:write'); + const body = await readJsonBody(ctx); + const id = nullableString(body.id); + const classId = nullableString(body.classId); + const assignedToUserId = nullableString(body.assignedToUserId); + const status = optionalChoice(body.status, STUDENT_SUPERVISION_RULE_STATUSES, 'active'); + const rules = parseSupervisionRules(body.rules); + const schedule = parseSupervisionSchedule(body.schedule); + const limit = boundedIntValue(body.limit, 20, 1, MAX_SUPERVISION_GENERATE); + + if (classId) { + await ensureReadableSupervisionClass(auth, classId); + } else if ((await scopedSupervisionClassIds(auth)) !== null) { + throw new HttpError(403, 'Scoped members must bind supervision rules to a readable class', 'CLASS_SCOPE_REQUIRED'); + } + + const item = await transaction(async client => { + await ensureUserTenantMembership(client, auth.tenantId, assignedToUserId, CRM_ASSIGNABLE_ROLES, 'ASSIGNEE_NOT_FOUND'); + const nextRunAt = status === 'active' ? nextSupervisionRunAt(schedule) : null; + const result = await client.query( + ` + insert into public.tenant_student_supervision_rules ( + id, tenant_id, name, status, rules, schedule, class_id, + assigned_to_user_id, limit_count, metadata, next_run_at, + created_by, updated_by + ) + values ( + coalesce($2::uuid, gen_random_uuid()), $1, $3, $4, $5::jsonb, $6::jsonb, $7::uuid, + $8::uuid, $9, $10::jsonb, $11::timestamptz, + $12, $12 + ) + on conflict (id) + do update set name = excluded.name, + status = excluded.status, + rules = excluded.rules, + schedule = excluded.schedule, + class_id = excluded.class_id, + assigned_to_user_id = excluded.assigned_to_user_id, + limit_count = excluded.limit_count, + metadata = excluded.metadata, + next_run_at = excluded.next_run_at, + updated_by = excluded.updated_by, + updated_at = now() + where public.tenant_student_supervision_rules.tenant_id = excluded.tenant_id + returning id, name, status, rules, schedule, + class_id as "classId", assigned_to_user_id as "assignedToUserId", + limit_count as "limit", metadata, + last_run_at as "lastRunAt", next_run_at as "nextRunAt", last_result as "lastResult", + created_by as "createdBy", updated_by as "updatedBy", + created_at as "createdAt", updated_at as "updatedAt" + `, + [ + auth.tenantId, + id, + requiredLimitedString(body, 'name', 120), + status, + JSON.stringify(rules), + JSON.stringify(schedule), + classId, + assignedToUserId, + limit, + JSON.stringify(objectValue(body.metadata)), + nextRunAt, + auth.userId, + ], + ); + + if (!result.rows[0]) { + throw new HttpError(404, 'Supervision rule not found for this tenant', 'SUPERVISION_RULE_NOT_FOUND'); + } + + await recordAudit(client, auth, 'tenant.students.supervision_rule_upserted', 'tenant_student_supervision_rules', result.rows[0].id, { + name: result.rows[0].name, + status, + classId, + assignedToUserId, + nextRunAt, + }); + + return result.rows[0]; + }); + + return { item }; +} + export async function generateTenantStudentSupervisionRoute(ctx: RequestContext) { const auth = await requireTenantAdmin(ctx); requireTenantPermission(auth, 'students:read'); @@ -2182,111 +1979,17 @@ export async function generateTenantStudentSupervisionRoute(ctx: RequestContext) const onlyStudentUserIds = Array.isArray(body.studentUserIds) ? strictUuidArrayValue(body.studentUserIds, 'studentUserIds', MAX_SUPERVISION_GENERATE) : []; - if (classId) await ensureReadableClass(auth, classId); + if (classId) await ensureReadableSupervisionClass(auth, classId); - const result = await transaction(async client => { - await ensureUserTenantMembership(client, auth.tenantId, assignedToUserId, CRM_ASSIGNABLE_ROLES, 'ASSIGNEE_NOT_FOUND'); - let candidates = await loadStudentSupervisionCandidates(auth, { - rules, - classId, - assignedToUserId, - studentUserIds: onlyStudentUserIds, - limit: Math.max(limit, onlyStudentUserIds.length || 0) || limit, - }); - candidates = candidates.slice(0, limit); - - const items: unknown[] = []; - const errors: unknown[] = []; - for (let index = 0; index < candidates.length; index += 1) { - const candidate = candidates[index]; - const studentUserId = String(candidate.studentUserId || ''); - try { - await ensureStudentInScope(auth, studentUserId); - const candidateClassId = nullableString(candidate.classId); - if (candidateClassId) await ensureTenantClass(client, auth.tenantId, candidateClassId); - const idempotencyKey = `student_supervision:${batchKey}:${studentUserId}`; - const metadata = { - ...objectValue(body.metadata), - autoSupervision: { - idempotencyKey, - batchKey, - generatedAt: new Date().toISOString(), - rules, - riskScore: candidate.riskScore, - reasons: candidate.reasons, - evidence: candidate.evidence, - }, - }; - const followup = await client.query>( - ` - insert into public.tenant_student_followups ( - tenant_id, student_user_id, assigned_to_user_id, class_id, - title, description, followup_type, priority, status, due_at, - metadata, created_by, updated_by - ) - values ( - $1, $2::uuid, $3::uuid, $4::uuid, - $5, $6, 'learning', $7, 'open', $8::timestamptz, - $9::jsonb, $10, $10 - ) - on conflict (tenant_id, (metadata->'autoSupervision'->>'idempotencyKey')) - where metadata->'autoSupervision'->>'idempotencyKey' is not null - do update set assigned_to_user_id = coalesce(excluded.assigned_to_user_id, public.tenant_student_followups.assigned_to_user_id), - class_id = coalesce(excluded.class_id, public.tenant_student_followups.class_id), - title = excluded.title, - description = excluded.description, - priority = excluded.priority, - due_at = excluded.due_at, - metadata = public.tenant_student_followups.metadata || excluded.metadata, - updated_by = excluded.updated_by, - updated_at = now() - returning id, student_user_id as "studentUserId", - assigned_to_user_id as "assignedToUserId", class_id as "classId", - title, description, followup_type as "followupType", priority, status, - due_at as "dueAt", metadata, created_at as "createdAt", updated_at as "updatedAt" - `, - [ - auth.tenantId, - studentUserId, - assignedToUserId, - candidateClassId, - candidate.title, - candidate.description, - candidate.priority, - dueAt, - JSON.stringify(metadata), - auth.userId, - ], - ); - items.push({ index, studentUserId, followupId: followup.rows[0].id, item: followup.rows[0] }); - } catch (error) { - errors.push({ - index, - studentUserId, - code: error instanceof HttpError ? error.code : 'STUDENT_SUPERVISION_ITEM_FAILED', - message: error instanceof Error ? error.message : 'Student supervision item failed', - }); - } - } - - await recordAudit(client, auth, 'tenant.students.supervision_generated', 'tenant_student_followups', null, { - batchKey, - classId, - assignedToUserId, - total: candidates.length, - successCount: items.length, - errorCount: errors.length, - rules, - }); - - return { - batchKey, - total: candidates.length, - successCount: items.length, - errorCount: errors.length, - items, - errors, - }; + const result = await generateStudentSupervisionFollowups(auth, { + rules, + classId, + assignedToUserId, + studentUserIds: onlyStudentUserIds, + dueAt, + batchKey, + limit, + metadata: objectValue(body.metadata), }); return result; diff --git a/apps/api/src/features/tenant-admin/index.ts b/apps/api/src/features/tenant-admin/index.ts index 002c8394..0b72a23a 100644 --- a/apps/api/src/features/tenant-admin/index.ts +++ b/apps/api/src/features/tenant-admin/index.ts @@ -6,6 +6,7 @@ import { removeTenantClassMemberRoute, tenantClassesRoute, tenantClassMembersRoute, + tenantStudentSupervisionRulesRoute, generateTenantStudentSupervisionRoute, tenantStudentFollowupsRoute, tenantStudentFollowupReportRoute, @@ -15,6 +16,7 @@ import { tenantTeachersRoute, pushTenantStudentsToCrmRoute, updateTenantStudentStatusRoute, + upsertTenantStudentSupervisionRuleRoute, upsertTenantStudentFollowupRoute, upsertTenantStudentNoteRoute, upsertTenantClassMemberRoute, @@ -107,6 +109,8 @@ export const tenantAdminRoutes: RouteDefinition[] = [ ['GET', '/api/tenant-admin/students/followups', tenantStudentFollowupsRoute], ['GET', '/api/tenant-admin/students/followups/report', tenantStudentFollowupReportRoute], ['PUT', '/api/tenant-admin/students/followups', upsertTenantStudentFollowupRoute], + ['GET', '/api/tenant-admin/students/supervision/rules', tenantStudentSupervisionRulesRoute], + ['PUT', '/api/tenant-admin/students/supervision/rules', upsertTenantStudentSupervisionRuleRoute], ['GET', '/api/tenant-admin/students/supervision/preview', tenantStudentSupervisionPreviewRoute], ['POST', '/api/tenant-admin/students/supervision/generate', generateTenantStudentSupervisionRoute], ['GET', '/api/tenant-admin/teachers', tenantTeachersRoute], diff --git a/apps/api/src/features/tenant-admin/supervision.ts b/apps/api/src/features/tenant-admin/supervision.ts new file mode 100644 index 00000000..a616fcf6 --- /dev/null +++ b/apps/api/src/features/tenant-admin/supervision.ts @@ -0,0 +1,766 @@ +import { createHash } from 'node:crypto'; +import type pg from 'pg'; +import { HttpError } from '../../core/http.js'; +import { query, transaction } from '../../core/db.js'; +import { hasTenantPermission, type TenantAdminAuth } from './auth.js'; + +export const MAX_SUPERVISION_GENERATE = 100; +export const CRM_ASSIGNABLE_ROLES = ['tenant_owner', 'tenant_admin', 'tenant_operator', 'teacher', 'sales', 'agent']; + +const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i; + +const SUPERVISION_RULE_DEFAULTS = { + windowDays: 14, + inactivityDays: 7, + minAnswers: 10, + lowAccuracyThreshold: 0.6, + wrongQuestionThreshold: 5, + vocabularyDueThreshold: 20, + staleSessionDays: 3, +}; + +export interface SupervisionRuleConfig { + windowDays: number; + inactivityDays: number; + minAnswers: number; + lowAccuracyThreshold: number; + wrongQuestionThreshold: number; + vocabularyDueThreshold: number; + staleSessionDays: number; +} + +export interface SupervisionScheduleConfig { + enabled: boolean; + frequency: 'manual' | 'daily' | 'weekly'; + hour: number; + minute: number; + timezone: 'Asia/Shanghai'; + weekdays: number[]; +} + +export interface SupervisionAuthContext { + tenantId: string; + userId: string | null; + role: string; + permissions: Record; + templatePermissions: Record; + fieldPermissions: Record; + dataScope: Record; +} + +export interface StudentSupervisionGenerateInput { + rules: SupervisionRuleConfig; + classId: string | null; + assignedToUserId: string | null; + studentUserIds?: string[]; + dueAt: string; + batchKey: string; + limit: number; + metadata?: Record; +} + +function nullableString(value: unknown) { + return typeof value === 'string' && value.trim() ? value.trim() : null; +} + +function objectValue(value: unknown): Record { + return value && typeof value === 'object' && !Array.isArray(value) ? value as Record : {}; +} + +function intValue(value: unknown, fallback: number) { + const numberValue = Number(value ?? fallback); + return Number.isFinite(numberValue) ? Math.trunc(numberValue) : fallback; +} + +function boundedIntValue(value: unknown, fallback: number, min: number, max: number) { + const parsed = intValue(value, fallback); + return Math.max(min, Math.min(max, parsed)); +} + +function numberValue(value: unknown, fallback = 0) { + const parsed = Number(value ?? fallback); + return Number.isFinite(parsed) ? parsed : fallback; +} + +function boundedNumberValue(value: unknown, fallback: number, min: number, max: number) { + const parsed = numberValue(value, fallback); + return Math.max(min, Math.min(max, parsed)); +} + +function boolValue(value: unknown, fallback: boolean) { + return typeof value === 'boolean' ? value : fallback; +} + +function uuidArrayValue(value: unknown) { + if (!Array.isArray(value)) return []; + return value + .map(item => (typeof item === 'string' ? item.trim() : '')) + .filter(item => UUID_PATTERN.test(item)); +} + +function permissionKeys(permission: string) { + const parts = permission.split(':').filter(Boolean); + const keys = [permission]; + for (let i = parts.length - 1; i >= 1; i -= 1) { + keys.push(`${parts.slice(0, i).join(':')}:*`); + } + keys.push('*'); + return keys; +} + +function explicitPermission(permissions: Record, permission: string) { + for (const key of permissionKeys(permission)) { + const value = permissions[key]; + if (typeof value === 'boolean') return value; + } + return null; +} + +function hasSupervisionPermission(auth: SupervisionAuthContext, permission: string) { + if ('roleTemplateId' in auth) { + return hasTenantPermission(auth as TenantAdminAuth, permission); + } + const explicit = explicitPermission(auth.permissions, permission); + if (explicit !== null) return explicit; + const templateExplicit = explicitPermission(auth.templatePermissions, permission); + if (templateExplicit !== null) return templateExplicit; + return auth.role === 'tenant_owner' || auth.role === 'tenant_admin' || auth.permissions['*'] === true; +} + +function canReadAllClassScope(auth: SupervisionAuthContext) { + return ( + auth.role === 'tenant_owner' || + auth.role === 'tenant_admin' || + hasSupervisionPermission(auth, 'classes:write') || + hasSupervisionPermission(auth, 'students:write') || + hasSupervisionPermission(auth, 'members:read') + ); +} + +function canSeeStudentPhone(auth: SupervisionAuthContext) { + return auth.fieldPermissions?.['student.phone'] !== false; +} + +export function parseSupervisionRules(value: unknown): SupervisionRuleConfig { + const raw = objectValue(value); + return { + windowDays: boundedIntValue(raw.windowDays, SUPERVISION_RULE_DEFAULTS.windowDays, 3, 90), + inactivityDays: boundedIntValue(raw.inactivityDays, SUPERVISION_RULE_DEFAULTS.inactivityDays, 1, 90), + minAnswers: boundedIntValue(raw.minAnswers, SUPERVISION_RULE_DEFAULTS.minAnswers, 1, 500), + lowAccuracyThreshold: boundedNumberValue(raw.lowAccuracyThreshold, SUPERVISION_RULE_DEFAULTS.lowAccuracyThreshold, 0.1, 0.95), + wrongQuestionThreshold: boundedIntValue(raw.wrongQuestionThreshold, SUPERVISION_RULE_DEFAULTS.wrongQuestionThreshold, 1, 200), + vocabularyDueThreshold: boundedIntValue(raw.vocabularyDueThreshold, SUPERVISION_RULE_DEFAULTS.vocabularyDueThreshold, 1, 1000), + staleSessionDays: boundedIntValue(raw.staleSessionDays, SUPERVISION_RULE_DEFAULTS.staleSessionDays, 1, 30), + }; +} + +export function parseSupervisionSchedule(value: unknown): SupervisionScheduleConfig { + const raw = objectValue(value); + const frequency = nullableString(raw.frequency) || 'manual'; + if (!['manual', 'daily', 'weekly'].includes(frequency)) { + throw new HttpError(400, 'Unsupported supervision schedule frequency', 'INVALID_SUPERVISION_SCHEDULE'); + } + const weekdays = (Array.isArray(raw.weekdays) ? raw.weekdays : []) + .map(item => boundedIntValue(item, 1, 1, 7)) + .filter((item, index, array) => array.indexOf(item) === index); + return { + enabled: boolValue(raw.enabled, frequency !== 'manual'), + frequency: frequency as SupervisionScheduleConfig['frequency'], + hour: boundedIntValue(raw.hour, 9, 0, 23), + minute: boundedIntValue(raw.minute, 0, 0, 59), + timezone: 'Asia/Shanghai', + weekdays: weekdays.length ? weekdays : [1, 2, 3, 4, 5], + }; +} + +export function supervisionBatchKey(value: unknown) { + const candidate = nullableString(value); + if (!candidate) return `manual:${shanghaiTodayKey()}`; + return candidate.length <= 120 ? candidate : createHash('sha256').update(candidate).digest('hex'); +} + +export function defaultSupervisionDueAt() { + const date = new Date(); + date.setDate(date.getDate() + 1); + date.setHours(18, 0, 0, 0); + return date.toISOString(); +} + +export function shanghaiTodayKey(date = new Date()) { + return shanghaiDateKey(date); +} + +function shanghaiDateKey(date: Date) { + const shanghai = new Date(date.getTime() + 8 * 60 * 60 * 1000); + return shanghai.toISOString().slice(0, 10); +} + +function shanghaiParts(date: Date) { + const shanghai = new Date(date.getTime() + 8 * 60 * 60 * 1000); + const day = shanghai.getUTCDay(); + return { + year: shanghai.getUTCFullYear(), + month: shanghai.getUTCMonth() + 1, + date: shanghai.getUTCDate(), + weekday: day === 0 ? 7 : day, + }; +} + +function shanghaiLocalIso(parts: { year: number; month: number; date: number }, hour: number, minute: number) { + return new Date(Date.UTC(parts.year, parts.month - 1, parts.date, hour - 8, minute, 0, 0)).toISOString(); +} + +function addShanghaiDays(parts: { year: number; month: number; date: number }, days: number) { + const shifted = new Date(Date.UTC(parts.year, parts.month - 1, parts.date + days, 0, 0, 0, 0)); + return { + year: shifted.getUTCFullYear(), + month: shifted.getUTCMonth() + 1, + date: shifted.getUTCDate(), + weekday: shifted.getUTCDay() === 0 ? 7 : shifted.getUTCDay(), + }; +} + +export function nextSupervisionRunAt(schedule: SupervisionScheduleConfig, now = new Date()) { + if (!schedule.enabled || schedule.frequency === 'manual') return null; + const today = shanghaiParts(now); + if (schedule.frequency === 'daily') { + const todayIso = shanghaiLocalIso(today, schedule.hour, schedule.minute); + if (Date.parse(todayIso) > now.getTime()) return todayIso; + return shanghaiLocalIso(addShanghaiDays(today, 1), schedule.hour, schedule.minute); + } + + for (let offset = 0; offset <= 14; offset += 1) { + const day = addShanghaiDays(today, offset); + if (!schedule.weekdays.includes(day.weekday)) continue; + const candidate = shanghaiLocalIso(day, schedule.hour, schedule.minute); + if (Date.parse(candidate) > now.getTime()) return candidate; + } + return shanghaiLocalIso(addShanghaiDays(today, 7), schedule.hour, schedule.minute); +} + +function supervisionPriority(score: number) { + if (score >= 90) return 'urgent'; + if (score >= 60) return 'high'; + return 'normal'; +} + +export async function scopedSupervisionClassIds(auth: SupervisionAuthContext) { + if (canReadAllClassScope(auth)) return null; + const explicit = uuidArrayValue(auth.dataScope?.classIds); + const rows = await query<{ id: string }>( + ` + select distinct class_id as id + from public.tenant_class_members + where tenant_id = $1 + and user_id = $2::uuid + and status = 'active' + and member_type in ('teacher', 'assistant', 'head_teacher') + `, + [auth.tenantId, auth.userId], + ); + return Array.from(new Set([...explicit, ...rows.map(item => item.id)])); +} + +export async function ensureReadableSupervisionClass(auth: SupervisionAuthContext, classId: string) { + const allowedClassIds = await scopedSupervisionClassIds(auth); + if (allowedClassIds && !allowedClassIds.includes(classId)) { + throw new HttpError(403, 'Class is outside the current data scope', 'CLASS_SCOPE_REQUIRED'); + } + const rows = await query<{ id: string }>( + 'select id from public.tenant_classes where tenant_id = $1 and id = $2::uuid limit 1', + [auth.tenantId, classId], + ); + if (!rows[0]) throw new HttpError(404, 'Class not found', 'CLASS_NOT_FOUND'); +} + +export async function ensureStudentInSupervisionScope(auth: SupervisionAuthContext, studentUserId: string) { + const scopedIds = await scopedSupervisionClassIds(auth); + const params: unknown[] = [auth.tenantId, studentUserId]; + const filters = [ + 'tm.tenant_id = $1', + 'tm.user_id = $2::uuid', + `tm.role = 'student'`, + ]; + if (scopedIds) { + params.push(scopedIds); + filters.push(`exists ( + select 1 from public.tenant_class_members scoped_cm + where scoped_cm.tenant_id = tm.tenant_id + and scoped_cm.user_id = tm.user_id + and scoped_cm.class_id = any($${params.length}::uuid[]) + and scoped_cm.member_type = 'student' + and scoped_cm.status = 'active' + )`); + } + const rows = await query<{ userId: string }>( + ` + select tm.user_id as "userId" + from public.tenant_memberships tm + where ${filters.join(' and ')} + limit 1 + `, + params, + ); + if (!rows[0]) { + throw new HttpError(scopedIds ? 403 : 404, 'Student is outside the current data scope', 'STUDENT_SCOPE_REQUIRED'); + } +} + +export async function ensureSupervisionAssignee( + client: pg.PoolClient, + tenantId: string, + userId: string | null, + errorCode = 'ASSIGNEE_NOT_FOUND', +) { + if (!userId) return; + const result = await client.query<{ id: string }>( + ` + select id + from public.tenant_memberships + where tenant_id = $1 + and user_id = $2::uuid + and role = any($3::text[]) + and status = 'active' + limit 1 + `, + [tenantId, userId, CRM_ASSIGNABLE_ROLES], + ); + if (!result.rows[0]) throw new HttpError(400, 'User is not an active tenant member', errorCode); +} + +export async function ensureSupervisionTenantClass(client: pg.PoolClient, tenantId: string, classId: string) { + const result = await client.query<{ id: string }>( + 'select id from public.tenant_classes where tenant_id = $1 and id = $2::uuid limit 1', + [tenantId, classId], + ); + if (!result.rows[0]) throw new HttpError(404, 'Class not found', 'CLASS_NOT_FOUND'); +} + +export async function loadStudentSupervisionCandidates(auth: SupervisionAuthContext, input: { + rules: SupervisionRuleConfig; + classId: string | null; + assignedToUserId: string | null; + studentUserIds?: string[]; + limit: number; +}) { + const scopedIds = await scopedSupervisionClassIds(auth); + const params: unknown[] = [auth.tenantId, input.rules.windowDays, input.rules.staleSessionDays]; + const filters = [ + 'tm.tenant_id = $1', + `tm.role = 'student'`, + `tm.status = 'active'`, + ]; + + if (input.classId) { + params.push(input.classId); + filters.push(`exists ( + select 1 from public.tenant_class_members scoped_cm + where scoped_cm.tenant_id = tm.tenant_id + and scoped_cm.user_id = tm.user_id + and scoped_cm.class_id = $${params.length}::uuid + and scoped_cm.member_type = 'student' + and scoped_cm.status = 'active' + )`); + } + if (scopedIds) { + params.push(scopedIds); + filters.push(`exists ( + select 1 from public.tenant_class_members scoped_cm + where scoped_cm.tenant_id = tm.tenant_id + and scoped_cm.user_id = tm.user_id + and scoped_cm.class_id = any($${params.length}::uuid[]) + and scoped_cm.member_type = 'student' + and scoped_cm.status = 'active' + )`); + } + if (input.studentUserIds?.length) { + params.push(input.studentUserIds); + filters.push(`tm.user_id = any($${params.length}::uuid[])`); + } + + params.push(Math.max(1, Math.min(MAX_SUPERVISION_GENERATE, input.limit))); + const rows = await query>( + ` + with student_scope as ( + select tm.tenant_id, tm.user_id, tm.created_at + from public.tenant_memberships tm + where ${filters.join(' and ')} + ), + class_agg as ( + select tcm.tenant_id, tcm.user_id, + min(tcm.class_id::text) as "defaultClassId", + jsonb_agg( + jsonb_build_object('classId', tc.id, 'className', tc.name, 'classCode', tc.code) + order by tc.sort_order asc, tc.created_at desc + ) filter (where tcm.status = 'active') as classes + from public.tenant_class_members tcm + join public.tenant_classes tc on tc.tenant_id = tcm.tenant_id and tc.id = tcm.class_id + join student_scope ss on ss.tenant_id = tcm.tenant_id and ss.user_id = tcm.user_id + where tcm.member_type = 'student' + and tcm.status = 'active' + group by tcm.tenant_id, tcm.user_id + ), + answers as ( + select ar.tenant_id, ar.user_id, + count(*) filter (where ar.answered_at >= now() - ($2::int * interval '1 day'))::int as "answerCount", + count(*) filter (where ar.answered_at >= now() - ($2::int * interval '1 day') and ar.is_correct is true)::int as "correctCount", + count(*) filter (where ar.answered_at >= now() - ($2::int * interval '1 day') and ar.is_correct is false)::int as "wrongAnswerCount", + max(ar.answered_at) as "latestAnsweredAt" + from public.answer_records ar + join student_scope ss on ss.tenant_id = ar.tenant_id and ss.user_id = ar.user_id + group by ar.tenant_id, ar.user_id + ), + wrongs as ( + select wq.tenant_id, wq.user_id, + count(*) filter (where wq.resolved_at is null)::int as "unresolvedWrongQuestions", + coalesce(sum(wq.wrong_count) filter (where wq.resolved_at is null), 0)::int as "wrongQuestionAttempts", + max(wq.last_wrong_at) filter (where wq.resolved_at is null) as "latestWrongAt" + from public.wrong_questions wq + join student_scope ss on ss.tenant_id = wq.tenant_id and ss.user_id = wq.user_id + group by wq.tenant_id, wq.user_id + ), + sessions as ( + select ps.tenant_id, ps.user_id, + count(*) filter ( + where ps.finished_at is null + and ps.started_at <= now() - ($3::int * interval '1 day') + and (ps.expires_at is null or ps.expires_at > now()) + )::int as "staleActiveSessions", + max(ps.started_at) as "latestSessionAt" + from public.practice_sessions ps + join student_scope ss on ss.tenant_id = ps.tenant_id and ss.user_id = ps.user_id + group by ps.tenant_id, ps.user_id + ), + reports as ( + select pr.tenant_id, pr.user_id, + max(pr.submitted_at) as "latestReportAt", + min(pr.accuracy) filter (where pr.submitted_at >= now() - ($2::int * interval '1 day')) as "lowestReportAccuracy", + max(pr.score) filter (where pr.submitted_at >= now() - ($2::int * interval '1 day')) as "bestReportScore" + from public.practice_session_reports pr + join student_scope ss on ss.tenant_id = pr.tenant_id and ss.user_id = pr.user_id + group by pr.tenant_id, pr.user_id + ), + vocab as ( + select uwp.tenant_id, uwp.user_id, + count(*) filter ( + where uwp.status in ('new', 'learning', 'reviewing') + and (uwp.next_review_date is null or uwp.next_review_date <= now()) + )::int as "dueVocabularyWords", + count(*) filter (where uwp.status = 'mastered')::int as "masteredVocabularyWords", + max(uwp.last_review_date) as "latestVocabularyReviewAt" + from public.user_word_progress uwp + join student_scope ss on ss.tenant_id = uwp.tenant_id and ss.user_id = uwp.user_id + group by uwp.tenant_id, uwp.user_id + ) + select ss.user_id as "studentUserId", + u.username, u.name, u.email::text as email, + case when ${canSeeStudentPhone(auth) ? 'true' : 'false'} then u.phone else null end as "studentPhone", + sp.region_id as "regionId", r.name as "regionName", + sp.selected_school_id as "selectedSchoolId", school.name as "selectedSchoolName", + sp.selected_major_id as "selectedMajorId", major.name as "selectedMajorName", + coalesce(sp.mastered_words_count, 0)::int as "profileMasteredWords", + coalesce(ca."defaultClassId", null) as "defaultClassId", + coalesce(ca.classes, '[]'::jsonb) as classes, + coalesce(a."answerCount", 0)::int as "answerCount", + coalesce(a."correctCount", 0)::int as "correctCount", + coalesce(a."wrongAnswerCount", 0)::int as "wrongAnswerCount", + a."latestAnsweredAt", + coalesce(w."unresolvedWrongQuestions", 0)::int as "unresolvedWrongQuestions", + coalesce(w."wrongQuestionAttempts", 0)::int as "wrongQuestionAttempts", + w."latestWrongAt", + coalesce(s."staleActiveSessions", 0)::int as "staleActiveSessions", + s."latestSessionAt", + rep."latestReportAt", + rep."lowestReportAccuracy", + rep."bestReportScore", + coalesce(v."dueVocabularyWords", 0)::int as "dueVocabularyWords", + coalesce(v."masteredVocabularyWords", 0)::int as "masteredVocabularyWords", + v."latestVocabularyReviewAt" + from student_scope ss + join public.platform_users u on u.id = ss.user_id + left join public.student_profiles sp on sp.tenant_id = ss.tenant_id and sp.user_id = ss.user_id + left join public.regions r on r.tenant_id = ss.tenant_id and r.id = sp.region_id + left join public.schools school on school.tenant_id = ss.tenant_id and school.id = sp.selected_school_id + left join public.majors major on major.tenant_id = ss.tenant_id and major.id = sp.selected_major_id + left join class_agg ca on ca.tenant_id = ss.tenant_id and ca.user_id = ss.user_id + left join answers a on a.tenant_id = ss.tenant_id and a.user_id = ss.user_id + left join wrongs w on w.tenant_id = ss.tenant_id and w.user_id = ss.user_id + left join sessions s on s.tenant_id = ss.tenant_id and s.user_id = ss.user_id + left join reports rep on rep.tenant_id = ss.tenant_id and rep.user_id = ss.user_id + left join vocab v on v.tenant_id = ss.tenant_id and v.user_id = ss.user_id + order by coalesce(a."latestAnsweredAt", s."latestSessionAt", v."latestVocabularyReviewAt", ss.created_at) asc nulls first + limit $${params.length} + `, + params, + ); + + return rows.map(row => buildSupervisionCandidate(row, input.rules, { + assignedToUserId: input.assignedToUserId, + classId: input.classId, + })).filter(Boolean) as Record[]; +} + +function buildSupervisionCandidate( + row: Record, + rules: SupervisionRuleConfig, + options: { assignedToUserId: string | null; classId: string | null }, +) { + const answerCount = intValue(row.answerCount, 0); + const correctCount = intValue(row.correctCount, 0); + const unresolvedWrongQuestions = intValue(row.unresolvedWrongQuestions, 0); + const staleActiveSessions = intValue(row.staleActiveSessions, 0); + const dueVocabularyWords = intValue(row.dueVocabularyWords, 0); + const latestStudyAt = latestIso([ + row.latestAnsweredAt, + row.latestSessionAt, + row.latestVocabularyReviewAt, + row.latestReportAt, + ]); + const inactiveDays = latestStudyAt ? Math.floor((Date.now() - new Date(latestStudyAt).getTime()) / 86_400_000) : null; + const accuracy = answerCount > 0 ? correctCount / answerCount : null; + const reasons: Array> = []; + let riskScore = 0; + + if (inactiveDays === null || inactiveDays >= rules.inactivityDays) { + const score = inactiveDays === null ? 35 : Math.min(55, inactiveDays * 5); + riskScore += score; + reasons.push({ + code: 'inactive', + label: inactiveDays === null ? '未产生学习记录' : `${inactiveDays} 天未学习`, + severity: inactiveDays === null || inactiveDays >= rules.inactivityDays * 2 ? 'high' : 'medium', + value: inactiveDays, + threshold: rules.inactivityDays, + }); + } + + if (unresolvedWrongQuestions >= rules.wrongQuestionThreshold) { + riskScore += Math.min(45, unresolvedWrongQuestions * 4); + reasons.push({ + code: 'wrong_backlog', + label: `未解决错题 ${unresolvedWrongQuestions} 道`, + severity: unresolvedWrongQuestions >= rules.wrongQuestionThreshold * 2 ? 'high' : 'medium', + value: unresolvedWrongQuestions, + threshold: rules.wrongQuestionThreshold, + }); + } + + if (answerCount >= rules.minAnswers && accuracy !== null && accuracy < rules.lowAccuracyThreshold) { + riskScore += Math.round((rules.lowAccuracyThreshold - accuracy) * 100); + reasons.push({ + code: 'low_accuracy', + label: `近 ${rules.windowDays} 天正确率 ${Math.round(accuracy * 100)}%`, + severity: accuracy < rules.lowAccuracyThreshold * 0.75 ? 'high' : 'medium', + value: Number(accuracy.toFixed(4)), + threshold: rules.lowAccuracyThreshold, + }); + } + + if (dueVocabularyWords >= rules.vocabularyDueThreshold) { + riskScore += Math.min(35, Math.ceil(dueVocabularyWords / Math.max(1, rules.vocabularyDueThreshold)) * 10); + reasons.push({ + code: 'vocabulary_due', + label: `待复习单词 ${dueVocabularyWords} 个`, + severity: dueVocabularyWords >= rules.vocabularyDueThreshold * 2 ? 'high' : 'medium', + value: dueVocabularyWords, + threshold: rules.vocabularyDueThreshold, + }); + } + + if (staleActiveSessions > 0) { + riskScore += Math.min(25, staleActiveSessions * 10); + reasons.push({ + code: 'stale_session', + label: `存在 ${staleActiveSessions} 个未完成练习`, + severity: 'medium', + value: staleActiveSessions, + threshold: 1, + }); + } + + if (!reasons.length) return null; + const priority = supervisionPriority(riskScore); + const studentName = nullableString(row.name) || nullableString(row.username) || nullableString(row.studentPhone) || String(row.studentUserId); + const primaryReason = String(reasons[0]?.label || '学习状态需要跟进'); + const classId = options.classId || nullableString(row.defaultClassId); + return { + studentUserId: row.studentUserId, + studentName, + studentPhone: row.studentPhone, + assignedToUserId: options.assignedToUserId, + classId, + classes: row.classes, + title: `学习督导：${primaryReason}`, + description: reasons.map(item => item.label).join('；'), + followupType: 'learning', + priority, + riskScore: Math.min(100, Math.round(riskScore)), + reasons, + evidence: { + windowDays: rules.windowDays, + answerCount, + correctCount, + wrongAnswerCount: intValue(row.wrongAnswerCount, 0), + accuracy: accuracy === null ? null : Number(accuracy.toFixed(4)), + latestStudyAt, + inactiveDays, + unresolvedWrongQuestions, + wrongQuestionAttempts: intValue(row.wrongQuestionAttempts, 0), + staleActiveSessions, + dueVocabularyWords, + masteredVocabularyWords: intValue(row.masteredVocabularyWords, 0), + latestWrongAt: row.latestWrongAt || null, + latestReportAt: row.latestReportAt || null, + lowestReportAccuracy: row.lowestReportAccuracy === null || row.lowestReportAccuracy === undefined ? null : numberValue(row.lowestReportAccuracy, 0), + bestReportScore: row.bestReportScore === null || row.bestReportScore === undefined ? null : numberValue(row.bestReportScore, 0), + latestVocabularyReviewAt: row.latestVocabularyReviewAt || null, + }, + }; +} + +function latestIso(values: unknown[]) { + const timestamps = values + .map(value => (typeof value === 'string' || value instanceof Date ? new Date(value).getTime() : NaN)) + .filter(Number.isFinite); + if (!timestamps.length) return null; + return new Date(Math.max(...timestamps)).toISOString(); +} + +export async function generateStudentSupervisionFollowups( + auth: SupervisionAuthContext, + input: StudentSupervisionGenerateInput, +) { + const limit = Math.max(1, Math.min(MAX_SUPERVISION_GENERATE, input.limit)); + return transaction(async client => { + await ensureSupervisionAssignee(client, auth.tenantId, input.assignedToUserId, 'ASSIGNEE_NOT_FOUND'); + let candidates = await loadStudentSupervisionCandidates(auth, { + rules: input.rules, + classId: input.classId, + assignedToUserId: input.assignedToUserId, + studentUserIds: input.studentUserIds, + limit: Math.max(limit, input.studentUserIds?.length || 0) || limit, + }); + candidates = candidates.slice(0, limit); + + const items: unknown[] = []; + const errors: unknown[] = []; + for (let index = 0; index < candidates.length; index += 1) { + const candidate = candidates[index]; + const studentUserId = String(candidate.studentUserId || ''); + try { + await ensureStudentInSupervisionScope(auth, studentUserId); + const candidateClassId = nullableString(candidate.classId); + if (candidateClassId) await ensureSupervisionTenantClass(client, auth.tenantId, candidateClassId); + const idempotencyKey = `student_supervision:${input.batchKey}:${studentUserId}`; + const inputMetadata = objectValue(input.metadata); + const metadata = { + ...inputMetadata, + autoSupervision: { + idempotencyKey, + batchKey: input.batchKey, + source: inputMetadata.source || 'manual', + ruleId: inputMetadata.ruleId || null, + ruleName: inputMetadata.ruleName || null, + workerId: inputMetadata.workerId || null, + generatedAt: new Date().toISOString(), + rules: input.rules, + riskScore: candidate.riskScore, + reasons: candidate.reasons, + evidence: candidate.evidence, + }, + }; + const followup = await client.query>( + ` + insert into public.tenant_student_followups ( + tenant_id, student_user_id, assigned_to_user_id, class_id, + title, description, followup_type, priority, status, due_at, + metadata, created_by, updated_by + ) + values ( + $1, $2::uuid, $3::uuid, $4::uuid, + $5, $6, 'learning', $7, 'open', $8::timestamptz, + $9::jsonb, $10::uuid, $10::uuid + ) + on conflict (tenant_id, (metadata->'autoSupervision'->>'idempotencyKey')) + where metadata->'autoSupervision'->>'idempotencyKey' is not null + do update set assigned_to_user_id = coalesce(excluded.assigned_to_user_id, public.tenant_student_followups.assigned_to_user_id), + class_id = coalesce(excluded.class_id, public.tenant_student_followups.class_id), + title = excluded.title, + description = excluded.description, + priority = excluded.priority, + due_at = excluded.due_at, + metadata = public.tenant_student_followups.metadata || excluded.metadata, + updated_by = excluded.updated_by, + updated_at = now() + returning id, student_user_id as "studentUserId", + assigned_to_user_id as "assignedToUserId", class_id as "classId", + title, description, followup_type as "followupType", priority, status, + due_at as "dueAt", metadata, created_at as "createdAt", updated_at as "updatedAt" + `, + [ + auth.tenantId, + studentUserId, + input.assignedToUserId, + candidateClassId, + candidate.title, + candidate.description, + candidate.priority, + input.dueAt, + JSON.stringify(metadata), + auth.userId, + ], + ); + items.push({ index, studentUserId, followupId: followup.rows[0].id, item: followup.rows[0] }); + } catch (error) { + errors.push({ + index, + studentUserId, + code: error instanceof HttpError ? error.code : 'STUDENT_SUPERVISION_ITEM_FAILED', + message: error instanceof Error ? error.message : 'Student supervision item failed', + }); + } + } + + await client.query( + ` + insert into public.audit_logs (tenant_id, actor_user_id, action, target_type, target_id, details) + values ($1, $2::uuid, 'tenant.students.supervision_generated', 'tenant_student_followups', null, $3::jsonb) + `, + [ + auth.tenantId, + auth.userId, + JSON.stringify({ + batchKey: input.batchKey, + classId: input.classId, + assignedToUserId: input.assignedToUserId, + total: candidates.length, + successCount: items.length, + errorCount: errors.length, + rules: input.rules, + source: objectValue(input.metadata).source || 'manual', + ruleId: objectValue(input.metadata).ruleId || null, + }), + ], + ); + + return { + batchKey: input.batchKey, + total: candidates.length, + successCount: items.length, + errorCount: errors.length, + items, + errors, + }; + }); +} + +export function supervisionSystemAuth(tenantId: string): SupervisionAuthContext { + return { + tenantId, + userId: null, + role: 'tenant_admin', + permissions: { '*': true }, + templatePermissions: {}, + fieldPermissions: { 'student.phone': false }, + dataScope: {}, + }; +} diff --git a/apps/taro/src/pages/tenant-admin/students/index.tsx b/apps/taro/src/pages/tenant-admin/students/index.tsx index 05801be7..b958d07e 100644 --- a/apps/taro/src/pages/tenant-admin/students/index.tsx +++ b/apps/taro/src/pages/tenant-admin/students/index.tsx @@ -9,6 +9,7 @@ import { loadTenantStudentFollowups, loadTenantStudentFollowupReport, loadTenantStudentNotes, + loadTenantStudentSupervisionRules, loadTenantStudents, loadTenantTeachers, loadTenantMembers, @@ -18,6 +19,7 @@ import { upsertTenantStudent, upsertTenantStudentFollowup, upsertTenantStudentNote, + upsertTenantStudentSupervisionRule, type BulkOperationResult, type TenantClassItem, type TenantStudentFollowupItem, @@ -27,6 +29,7 @@ import { type TenantStudentCrmPushInput, type TenantStudentFollowupReport, type TenantStudentSupervisionCandidate, + type TenantStudentSupervisionRuleItem, type TenantTeacherItem, type TenantMemberItem, } from '@/services/tenantAdmin'; @@ -139,6 +142,7 @@ export default function TenantStudentsPage() { const [supervisionResult, setSupervisionResult] = useState(null); const [followupReport, setFollowupReport] = useState(null); const [supervisionCandidates, setSupervisionCandidates] = useState([]); + const [supervisionRulesList, setSupervisionRulesList] = useState([]); const [supervisionRules, setSupervisionRules] = useState(defaultSupervisionRules); const [scoped, setScoped] = useState(false); const [busy, setBusy] = useState(''); @@ -163,7 +167,8 @@ export default function TenantStudentsPage() { }), loadTenantStudentFollowups({ status: 'open', limit: 30 }).catch(() => ({ items: [] })), loadTenantStudentFollowupReport({ timeRange: '30d', classId: nextClassId || undefined, limit: 8 }).catch(() => ({ item: null })), - ]).then(([classPayload, teacherPayload, memberPayload, studentPayload, followupPayload, reportPayload]) => { + loadTenantStudentSupervisionRules({ limit: 20 }).catch(() => ({ items: [] })), + ]).then(([classPayload, teacherPayload, memberPayload, studentPayload, followupPayload, reportPayload, supervisionRulePayload]) => { setClasses(classPayload.items || []); setTeachers(teacherPayload.items || []); setCrmAssignees((memberPayload.items || []).filter(item => crmAssignableRoles.includes(String(item.role || '')))); @@ -171,6 +176,7 @@ export default function TenantStudentsPage() { setScoped(studentPayload.scoped === true); setFollowups(followupPayload.items || []); setFollowupReport(reportPayload.item || null); + setSupervisionRulesList(supervisionRulePayload.items || []); }).catch(nextError => setError(nextError instanceof Error ? nextError.message : '学生数据加载失败')); } @@ -391,6 +397,36 @@ export default function TenantStudentsPage() { } } + async function saveSupervisionRule() { + setBusy('supervisionRule'); + setError(''); + try { + const payload = await upsertTenantStudentSupervisionRule({ + name: `${activeClass?.name || '全租户'} 学习督导`, + status: 'active', + rules: supervisionRules, + schedule: { + enabled: true, + frequency: 'daily', + hour: 9, + minute: 0, + timezone: 'Asia/Shanghai', + weekdays: [1, 2, 3, 4, 5, 6, 7], + }, + classId: selectedClassId || null, + limit: 20, + metadata: { source: 'taro-tenant-admin' }, + }); + setSupervisionRulesList(prev => [payload.item, ...prev.filter(item => item.id !== payload.item?.id)].filter(Boolean) as TenantStudentSupervisionRuleItem[]); + Taro.showToast({ title: '督导规则已保存', icon: 'success' }); + reload(); + } catch (nextError) { + setError(nextError instanceof Error ? nextError.message : '督导规则保存失败'); + } finally { + setBusy(''); + } + } + async function saveNote() { if (!selectedStudent) { Taro.showToast({ title: '请选择学生', icon: 'none' }); @@ -647,6 +683,7 @@ export default function TenantStudentsPage() { + {supervisionResult ? {resultSummary(supervisionResult)} : null} @@ -658,6 +695,14 @@ export default function TenantStudentsPage() { ))} {!supervisionCandidates.length ? 可按当前班级范围预览未学习、错题积压、正确率偏低、单词待复习和未完成练习的学生。 : null} + + {supervisionRulesList.slice(0, 5).map(item => ( + + {item.name} · {item.status || 'active'} + 范围 {item.className || '全租户'} · 下次 {String(item.nextRunAt || '-')} · 最近 {String(item.lastResult?.status || '未运行')} + + ))} + diff --git a/apps/taro/src/services/tenantAdmin.ts b/apps/taro/src/services/tenantAdmin.ts index c79b5cb2..d8b85c4d 100644 --- a/apps/taro/src/services/tenantAdmin.ts +++ b/apps/taro/src/services/tenantAdmin.ts @@ -208,6 +208,39 @@ export interface TenantStudentSupervisionPreview { }; } +export interface TenantStudentSupervisionSchedule { + enabled?: boolean; + frequency?: 'manual' | 'daily' | 'weekly'; + hour?: number; + minute?: number; + timezone?: string; + weekdays?: number[]; +} + +export interface TenantStudentSupervisionRuleItem { + id: string; + name: string; + status?: string; + rules?: TenantStudentSupervisionRules; + schedule?: TenantStudentSupervisionSchedule; + classId?: string | null; + className?: string | null; + assignedToUserId?: string | null; + assignedToName?: string | null; + limit?: number; + metadata?: Record; + lastRunAt?: string | null; + nextRunAt?: string | null; + lastResult?: Record; + createdAt?: string; + updatedAt?: string; +} + +export interface TenantStudentSupervisionRulesPayload { + items?: TenantStudentSupervisionRuleItem[]; + scoped?: boolean; +} + export interface ImportJobItem { id: string; importType?: string; @@ -1157,6 +1190,32 @@ export async function previewTenantStudentSupervision(query: TenantStudentSuperv }); } +export async function loadTenantStudentSupervisionRules(query: { + status?: string; + limit?: number; +} = {}) { + return apiRequest('/api/tenant-admin/students/supervision/rules', { + query: { ...query, limit: query.limit || 50 }, + }); +} + +export async function upsertTenantStudentSupervisionRule(input: { + id?: string; + name: string; + status?: string; + rules?: TenantStudentSupervisionRules; + schedule?: TenantStudentSupervisionSchedule; + classId?: string | null; + assignedToUserId?: string | null; + limit?: number; + metadata?: Record; +}) { + return apiRequest<{ item?: TenantStudentSupervisionRuleItem }>('/api/tenant-admin/students/supervision/rules', { + method: 'PUT', + body: input, + }); +} + export async function generateTenantStudentSupervision(input: { rules?: TenantStudentSupervisionRules; classId?: string | null; diff --git a/apps/worker/src/config.ts b/apps/worker/src/config.ts index 0e38fefa..36cabe18 100644 --- a/apps/worker/src/config.ts +++ b/apps/worker/src/config.ts @@ -56,6 +56,9 @@ export interface WorkerConfig { exportBatchSize: number; exportWorkerId: string; exportBackoffSeconds: number[]; + studentSupervisionBatchSize: number; + studentSupervisionWorkerId: string; + studentSupervisionClaimStaleSeconds: number; exportLocalStorageRoot: string; exportPdfFontPath: string; storageDefaultProvider: string; @@ -237,6 +240,9 @@ const loadedConfig: WorkerConfig = { exportBackoffSeconds: envList('WORKER_EXPORT_BACKOFF_SECONDS', '30,120,600,1800') .map((value: string) => Number(value)) .filter((value: number) => Number.isFinite(value) && value > 0), + studentSupervisionBatchSize: envNumber('WORKER_STUDENT_SUPERVISION_BATCH_SIZE', 20), + studentSupervisionWorkerId: envString('WORKER_STUDENT_SUPERVISION_ID', `student-supervision-${process.pid}`), + studentSupervisionClaimStaleSeconds: envNumber('WORKER_STUDENT_SUPERVISION_CLAIM_STALE_SECONDS', 15 * 60), exportLocalStorageRoot: envString('EXPORT_LOCAL_STORAGE_ROOT', '.local-storage'), exportPdfFontPath: envString('EXPORT_PDF_FONT_PATH', ''), storageDefaultProvider: envString('STORAGE_DEFAULT_PROVIDER', 'local_dev'), diff --git a/apps/worker/src/index.ts b/apps/worker/src/index.ts index c204c857..806d9a99 100644 --- a/apps/worker/src/index.ts +++ b/apps/worker/src/index.ts @@ -131,6 +131,18 @@ async function runOnce() { ); return; } + if (job === 'student-supervision') { + const { closePool: closeApiPool } = await import('../../api/src/core/db.js'); + const { processStudentSupervisionBatch } = await import('./jobs/student-supervision.js'); + extraClosers.add(closeApiPool); + const result = await processStudentSupervisionBatch(); + console.log( + `[worker] student-supervision batch processed=${result.processed}` + + ` generated=${result.generated} followups=${result.followups}` + + ` failed=${result.failed} skipped=${result.skipped}`, + ); + return; + } throw new Error(`Unsupported worker job: ${job}`); } diff --git a/apps/worker/src/jobs/student-supervision.ts b/apps/worker/src/jobs/student-supervision.ts new file mode 100644 index 00000000..dbfdf1cb --- /dev/null +++ b/apps/worker/src/jobs/student-supervision.ts @@ -0,0 +1,269 @@ +import crypto from 'node:crypto'; +import { pool } from '../db.js'; +import { config } from '../config.js'; +import { + defaultSupervisionDueAt, + generateStudentSupervisionFollowups, + nextSupervisionRunAt, + parseSupervisionRules, + parseSupervisionSchedule, + shanghaiTodayKey, + supervisionSystemAuth, +} from '../../../api/src/features/tenant-admin/supervision.js'; + +interface SupervisionRuleCandidate { + id: string; + tenantId: string; + name: string; + rules: Record; + schedule: Record; + classId: string | null; + assignedToUserId: string | null; + limit: number; + metadata: Record; +} + +export interface StudentSupervisionWorkerResult { + processed: number; + generated: number; + failed: number; + skipped: number; + followups: number; +} + +function nowIso() { + return new Date().toISOString(); +} + +function errorMessage(error: unknown) { + return error instanceof Error ? error.message : String(error); +} + +function errorCode(error: unknown) { + return typeof error === 'object' && error !== null && 'code' in error + ? String((error as { code?: unknown }).code || 'STUDENT_SUPERVISION_WORKER_ERROR') + : 'STUDENT_SUPERVISION_WORKER_ERROR'; +} + +function truncate(value: unknown, max = 1900) { + return String(value ?? '').slice(0, max); +} + +function stableBatchKey(rule: SupervisionRuleCandidate) { + const raw = [ + 'worker', + rule.id, + shanghaiTodayKey(), + ].join(':'); + return raw.length <= 120 ? raw : crypto.createHash('sha256').update(raw).digest('hex'); +} + +async function claimStudentSupervisionRules(limit: number, claimId: string) { + const client = await pool.connect(); + try { + await client.query('begin'); + const result = await client.query( + ` + with candidates as ( + select sr.id + from public.tenant_student_supervision_rules sr + join public.tenants t on t.id = sr.tenant_id + where t.status = 'active' + and sr.status = 'active' + and coalesce(sr.schedule->>'enabled', 'false') = 'true' + and coalesce(sr.schedule->>'frequency', 'manual') <> 'manual' + and coalesce(sr.next_run_at, sr.created_at) <= now() + and coalesce(nullif(sr.metadata #>> '{studentSupervisionWorker,claimedAt}', '')::timestamptz, '1970-01-01'::timestamptz) + <= now() - ($2::integer * interval '1 second') + order by coalesce(sr.next_run_at, sr.created_at) asc, sr.created_at asc + limit $1 + for update of sr skip locked + ) + update public.tenant_student_supervision_rules sr + set metadata = jsonb_set( + coalesce(sr.metadata, '{}'::jsonb), + '{studentSupervisionWorker}', + coalesce(sr.metadata->'studentSupervisionWorker', '{}'::jsonb) || $3::jsonb, + true + ), + updated_at = now() + from candidates + where sr.id = candidates.id + returning sr.id, + sr.tenant_id as "tenantId", + sr.name, + sr.rules, + sr.schedule, + sr.class_id as "classId", + sr.assigned_to_user_id as "assignedToUserId", + sr.limit_count as "limit", + sr.metadata + `, + [ + Math.max(1, Math.min(100, limit)), + Math.max(60, config.studentSupervisionClaimStaleSeconds), + JSON.stringify({ + claimId, + workerId: config.studentSupervisionWorkerId, + claimedAt: nowIso(), + }), + ], + ); + await client.query('commit'); + return result.rows; + } catch (error) { + await client.query('rollback'); + throw error; + } finally { + client.release(); + } +} + +async function markRuleFailed(rule: SupervisionRuleCandidate, error: unknown) { + const schedule = parseSupervisionSchedule(rule.schedule); + const nextRunAt = nextSupervisionRunAt(schedule); + const details = { + code: errorCode(error), + message: truncate(errorMessage(error)), + failedAt: nowIso(), + workerId: config.studentSupervisionWorkerId, + }; + await pool.query( + ` + update public.tenant_student_supervision_rules + set last_run_at = now(), + next_run_at = $3::timestamptz, + last_result = $4::jsonb, + metadata = jsonb_set( + coalesce(metadata, '{}'::jsonb), + '{studentSupervisionWorker}', + coalesce(metadata->'studentSupervisionWorker', '{}'::jsonb) || $5::jsonb, + true + ), + updated_at = now() + where tenant_id = $1 and id = $2 + `, + [ + rule.tenantId, + rule.id, + nextRunAt, + JSON.stringify({ status: 'failed', ...details }), + JSON.stringify({ + lastStatus: 'failed', + lastError: details, + lastWorkerId: config.studentSupervisionWorkerId, + lastFinishedAt: nowIso(), + }), + ], + ); + await pool.query( + ` + insert into public.audit_logs (tenant_id, actor_user_id, action, target_type, target_id, details) + values ($1, null, 'tenant.students.supervision_rule_worker_failed', 'tenant_student_supervision_rules', $2, $3::jsonb) + `, + [rule.tenantId, rule.id, JSON.stringify(details)], + ).catch(() => {}); +} + +async function processRule(rule: SupervisionRuleCandidate) { + const rules = parseSupervisionRules(rule.rules); + const schedule = parseSupervisionSchedule(rule.schedule); + const result = await generateStudentSupervisionFollowups( + supervisionSystemAuth(rule.tenantId), + { + rules, + classId: rule.classId, + assignedToUserId: rule.assignedToUserId, + dueAt: defaultSupervisionDueAt(), + batchKey: stableBatchKey(rule), + limit: Math.max(1, Math.min(100, Number(rule.limit || 20))), + metadata: { + ...rule.metadata, + source: 'student_supervision_worker', + ruleId: rule.id, + ruleName: rule.name, + workerId: config.studentSupervisionWorkerId, + }, + }, + ); + const nextRunAt = nextSupervisionRunAt(schedule); + await pool.query( + ` + update public.tenant_student_supervision_rules + set last_run_at = now(), + next_run_at = $3::timestamptz, + last_result = $4::jsonb, + metadata = jsonb_set( + coalesce(metadata, '{}'::jsonb), + '{studentSupervisionWorker}', + coalesce(metadata->'studentSupervisionWorker', '{}'::jsonb) || $5::jsonb, + true + ), + updated_at = now() + where tenant_id = $1 and id = $2 + `, + [ + rule.tenantId, + rule.id, + nextRunAt, + JSON.stringify({ + status: result.errorCount ? 'completed_with_errors' : 'completed', + ranAt: nowIso(), + nextRunAt, + batchKey: result.batchKey, + total: result.total, + successCount: result.successCount, + errorCount: result.errorCount, + }), + JSON.stringify({ + lastStatus: result.errorCount ? 'completed_with_errors' : 'completed', + lastWorkerId: config.studentSupervisionWorkerId, + lastFinishedAt: nowIso(), + }), + ], + ); + await pool.query( + ` + insert into public.audit_logs (tenant_id, actor_user_id, action, target_type, target_id, details) + values ($1, null, 'tenant.students.supervision_rule_worker_completed', 'tenant_student_supervision_rules', $2, $3::jsonb) + `, + [ + rule.tenantId, + rule.id, + JSON.stringify({ + batchKey: result.batchKey, + total: result.total, + successCount: result.successCount, + errorCount: result.errorCount, + workerId: config.studentSupervisionWorkerId, + }), + ], + ); + return result; +} + +export async function processStudentSupervisionBatch(): Promise { + const claimId = crypto.randomUUID(); + const rules = await claimStudentSupervisionRules(config.studentSupervisionBatchSize, claimId); + const result: StudentSupervisionWorkerResult = { + processed: 0, + generated: 0, + failed: 0, + skipped: 0, + followups: 0, + }; + + for (const rule of rules) { + result.processed += 1; + try { + const generated = await processRule(rule); + result.generated += 1; + result.followups += generated.successCount || 0; + } catch (error) { + result.failed += 1; + await markRuleFailed(rule, error); + } + } + + return result; +} diff --git a/docs/refactor/backend-capability-status.md b/docs/refactor/backend-capability-status.md index 8e73abeb..0d4537fb 100644 --- a/docs/refactor/backend-capability-status.md +++ b/docs/refactor/backend-capability-status.md @@ -45,7 +45,7 @@ | 租户角色权限 | 可联调 | `tenant_memberships.role + permissions + role_template_id`，接口有权限点校验 | | 自定义角色模板 | 可联调 | `tenant_role_templates` + `/api/tenant-admin/role-templates`，支持权限、菜单、模块、字段、数据范围配置；Taro 租户设置页已接创建、编辑、停用、权限点、菜单、模块、字段和基础数据范围配置第一版 | | 班级/教师/学生范围权限 | 可联调 | `tenant_classes`、`tenant_class_members` + `/api/tenant-admin/classes`、`classes/members`、`students`、`teachers`；教师默认只看自己负责班级，字段权限可脱敏学生手机号 | -| 学生运营备注、跟进和学习督导 | 可联调 | `tenant_student_notes`、`tenant_student_followups` + `/api/tenant-admin/students/notes`、`students/followups`、`students/supervision/preview`、`students/supervision/generate`；教师/班主任只能操作范围内学生，支持备注可见性、任务指派、完成状态、学习风险候选预览、自动生成跟进任务和审计 | +| 学生运营备注、跟进和学习督导 | 可联调 | `tenant_student_notes`、`tenant_student_followups`、`tenant_student_supervision_rules` + `/api/tenant-admin/students/notes`、`students/followups`、`students/supervision/preview`、`students/supervision/generate`、`students/supervision/rules`；教师/班主任只能操作范围内学生，支持备注可见性、任务指派、完成状态、学习风险候选预览、自动生成跟进任务、督导规则模板和审计；`apps/worker --job student-supervision` 可按启用规则定时生成 `learning` 跟进任务 | ## 学生端题库主链路 @@ -144,7 +144,7 @@ | 激活码批次/生成/列表 | 可联调 | `/api/tenant-admin/code-batches`、`activation-codes` | | 成员/角色权限/审计 | 可联调 | `/api/tenant-admin/members`、`permissions`、`role-templates`、`audit-logs` | | 班级/学生/教师管理 | 可联调 | `/api/tenant-admin/classes`、`classes/members`、`students`、`teachers`，支持班级范围权限和审计 | -| 学生批量运营 | 可联调 | `/api/tenant-admin/students/bulk-upsert`、`students/status`、`classes/members/bulk-assign`、`students/notes`、`students/followups`、`students/followups/report`、`students/supervision/preview`、`students/supervision/generate`、`students/crm-push`；支持逐行结果、限量、防跨租户和教师范围校验；跟进报表支持 7/30/90 天或自定义日期范围、状态/类型/优先级/负责人/班级聚合、逾期待办、CRM 推送队列摘要和每日趋势；学习督导由后端读取答题、错题、单词待复习和未完成练习数据，按阈值预览候选并幂等生成 `learning` 跟进任务，要求 `students:supervision:read/write`；批量 CRM 推送会为学生生成跟进任务并写入异步 CRM 队列，要求 `crm:write`、`students:read`、`students:followups:write`；学生导入/upsert/分班禁止 `avatarUrl/avatar_url/avatar/headimgurl/figureurl` 和 `primaryRole/primary_role`，避免绕过预设头像与租户角色体系 | +| 学生批量运营 | 可联调 | `/api/tenant-admin/students/bulk-upsert`、`students/status`、`classes/members/bulk-assign`、`students/notes`、`students/followups`、`students/followups/report`、`students/supervision/preview`、`students/supervision/generate`、`students/supervision/rules`、`students/crm-push`；支持逐行结果、限量、防跨租户和教师范围校验；跟进报表支持 7/30/90 天或自定义日期范围、状态/类型/优先级/负责人/班级聚合、逾期待办、CRM 推送队列摘要和每日趋势；学习督导由后端读取答题、错题、单词待复习和未完成练习数据，按阈值预览候选并幂等生成 `learning` 跟进任务，也可保存手动/每日/每周规则交给 worker 定时生成，要求 `students:supervision:read/write`；批量 CRM 推送会为学生生成跟进任务并写入异步 CRM 队列，要求 `crm:write`、`students:read`、`students:followups:write`；学生导入/upsert/分班禁止 `avatarUrl/avatar_url/avatar/headimgurl/figureurl` 和 `primaryRole/primary_role`，避免绕过预设头像与租户角色体系 | | 用户站内通知查看 | 可联调 | `GET /api/tenant-admin/user-notifications`；需要 `notifications:read` 权限，支持按用户、状态、类型查询租户内通知和状态汇总，租户后台只读不直接代学生改状态 | | 平台租户/详情/账务资料/员工/审计/告警/套餐/订阅/账单/用量 | 可联调 | `/api/platform-admin/*`；已支持当前平台账号权限目录、平台员工列表、平台员工创建/编辑、平台员工禁用/恢复、租户列表、创建租户、租户详情、状态变更、账务资料维护、平台审计日志查询、CSV/JSON 审计导出、平台审计告警规则查询、告警列表、确认/解决/忽略、审计告警外部通知渠道和发送事件、SaaS 套餐、订阅、账单、订阅账单候选预览、dry-run、批量生成、自动计费 worker、重复开票保护、收款、逾期标记、内部催缴台账、催缴外部通知渠道和发送事件、用量；平台 API 已拆分 `platform:staff:read/write/status`、`platform:tenant:read/write/status/billing_profile`、`platform:billing:read/write/payment/dunning/notification`、`platform:audit:read/export/alert/notification`、`platform:question_bank:read/grant/ops` 等权限点；审计导出、平台员工操作、告警响应和通知事件都会对 `details`/payload 中的 token/secret/password/key 等敏感字段递归脱敏；`apps/worker --job platform-audit-alerts` 会把租户状态变更、账务资料变更、批量开票、逾期处理、手工收款确认、审计导出等高风险平台审计动作生成内部告警；`apps/worker --job platform-audit-notifications` 会按 `platform_audit_notification_channels` 把开放告警推送到 generic/钉钉/飞书/企微 webhook，签名密钥放 `app_private.platform_secrets` 且 API 不回显原文；`apps/worker --job platform-dunning-notifications` 会按 `platform_dunning_notification_channels` 把内部催缴记录推送到 generic/钉钉/飞书/企微 webhook，发送成功会推进提醒状态，失败会退避重试，联系方式和请求 payload 会脱敏；创建租户、平台员工变更、状态变更、账务资料维护、订阅批量开票、自动开票、逾期催缴、手工收款确认、审计导出、告警状态更新、通知渠道变更和催缴通知渠道变更会写入审计 | | 数据看板聚合接口 | 可联调 | `GET /api/tenant-admin/dashboard`；支持 `7d/30d/90d`、地区筛选、学生/学习/内容/订单/激活码/反馈卡片、趋势、24h 活跃、题型分布、科目排行、地区统计、套餐销量和运营动态 | @@ -210,6 +210,7 @@ npm run test:worker:platform-audit-notifications npm run test:worker:assets npm run test:worker:exports npm run test:worker:public-banks +npm run test:worker:student-supervision git diff --check ``` diff --git a/docs/refactor/backend-handoff-roadmap.md b/docs/refactor/backend-handoff-roadmap.md index ca460a5e..55bfe3e8 100644 --- a/docs/refactor/backend-handoff-roadmap.md +++ b/docs/refactor/backend-handoff-roadmap.md @@ -22,7 +22,7 @@ | --- | --- | --- | --- | | 多租户底座 | 可联调 | 租户、域名、品牌、设置、RLS 基础、审计、Supabase JWT/API 身份映射；`npm run test:rls` 已提供本地动态租户隔离验收；`npm run smoke:auth:remote` 已提供真实云端 Supabase access token 回归脚本 | 真实云端 Auth/JWKS 回归需要在预生产/生产环境执行并留档，生产 RLS 深测继续执行 | | 平台后台 | 基础完成 | 租户、租户详情、账务资料维护、平台账号细粒度权限目录、平台员工列表/创建/编辑/启停、平台路由权限强校验、平台审计日志查询、平台审计 CSV/JSON 导出、平台审计告警规则/列表/确认/解决、platform-audit-alerts worker、审计告警外部通知渠道/事件 API、platform-audit-notifications worker、套餐、订阅、订阅账单候选预览、dry-run、批量生成、自动计费 worker、重复开票保护、服务费、人工收款、逾期标记、内部催缴台账、催缴外部通知渠道/事件 API、platform-dunning-notifications worker、用量、公共题库授权、公共题库地区/科目授权校验、SaaS 套餐/订阅 metadata 公共题库访问边界、公共题库自动同步 worker、公共题库冲突单条/批量处理 API、公共题库同步通知第一版 | 平台在线收款、平台审计告警升级策略和更完整运营消息 | -| 租户后台 | 可联调 | 品牌、域名、支付账户、登录配置、密钥掩码、活动、兑换码、优惠券、勋章管理/手动发放/签到/积分/反馈/活动自动发放、积分任务、积分兑换、积分风控只读报表、用户站内通知查看、成员权限、角色模板、菜单/模块/字段权限配置 API、班级/教师/学生范围权限；Taro 工作台已接权限驱动模块入口，学生运营页已接学生创建/更新、禁用/恢复、批量导入、批量分班、备注和跟进任务第一版，租户设置页已接角色模板和成员绑定操作台第一版，营销中心已接 CRM 配置/队列、分佣结算、优惠券规则/核销报表、积分任务/兑换操作台、积分风控摘要和用户通知查看第一版 | 更细的数据范围组合、成员批量运营、真实打款/导出/凭证和完整权限菜单 | +| 租户后台 | 可联调 | 品牌、域名、支付账户、登录配置、密钥掩码、活动、兑换码、优惠券、勋章管理/手动发放/签到/积分/反馈/活动自动发放、积分任务、积分兑换、积分风控只读报表、用户站内通知查看、成员权限、角色模板、菜单/模块/字段权限配置 API、班级/教师/学生范围权限、学生运营跟进、学习督导规则模板和 `student-supervision` worker；Taro 工作台已接权限驱动模块入口，学生运营页已接学生创建/更新、禁用/恢复、批量导入、批量分班、备注、跟进任务、学习督导预览/生成和保存每日规则第一版，租户设置页已接角色模板和成员绑定操作台第一版，营销中心已接 CRM 配置/队列、分佣结算、优惠券规则/核销报表、积分任务/兑换操作台、积分风控摘要和用户通知查看第一版 | 更细的数据范围组合、成员批量运营、学习督导触达联动/效果归因、真实打款/导出/凭证和完整权限菜单 | | 题库与练习 | 可联调 | 内容入口、任意深度分类、题目集合、顺序/随机/全真模拟蓝图、组卷快照、客观题后端判分、主观题 `selfJudgedCorrect` 自评、阅读理解/案例分析 `subAnswers` 多小题判分、答题、错题、收藏、模考报告、排行榜接口（租户默认关闭）、公共题库采纳快照、手动同步、自动同步 worker、冲突查询/单条和批量处理 API、公共题库同步通知、starter 单地区/专业版全国公共题库访问边界、JSON/试卷 payload 导出、PDF/Word 异步导出 worker、水印和资料发布路径、每日一练九宫格 metadata、PDF/Word 运营版式和 ZIP 图片素材包 | 长题干/公式图片混排体验、导出模板精排、导出操作台、排行榜开启前压测、防刷和预聚合 | | 背单词 | 可联调 | 单元、单词、进度、收藏、统计、每日计划、JSON/CSV/Excel 导入、排行榜接口（租户默认关闭） | 更细复习参数 | | 知识手册 | 可联调 | 科目、章节、条目、Markdown 内容、嵌套 JSON/CSV/Excel 导入 | 富文本资源、版本管理、附件/PDF 关联 | @@ -35,7 +35,7 @@ | 内容导入 | 可联调 | 题目、单词、知识手册、分数线、视频 JSON/CSV/Excel preview/import、issue、job/detail、审计、幂等、`executionMode=async`、imports worker、导入后复检、模板下载、字段映射 API、字段映射覆盖白名单校验、PocketBase JSON dry-run 报告；Taro 租户内容页已接上传/粘贴预览、模板文件下载、字段别名编辑、同步/异步执行、异步轮询和复检详情第一版 | 真实数据 dry-run 执行验收、抽样校验和导入性能压测 | | 数据看板 | 可联调 | 租户 dashboard 聚合接口，收益、注册、学习、内容、激活码、反馈、趋势、24h 活跃、套餐销量和运营动态 | 预聚合 worker、缓存、慢 SQL 监控和销售转化看板 | | AI 择校推荐 | 可联调 | `ai_recommendation_reports`、SVIP 门禁、学生输入 schema、地区/分数线上下文、`local_rules` 稳定 JSON、报告列表/详情和 Taro 学生端基础页 | 真实 AI provider、prompt 版本管理、租户后台配置、报告 PDF 渲染和人工复核流程 | -| Taro 前端 | 地基已建 | `apps/taro` 已有 Taro 4 React 工程、H5 三入口、租户解析、统一 API client、Supabase Auth client 初始化；学生端、租户后台和平台后台均已有第一批真实 API 页面；学生端已接地区选择、刷题答题卡、后端权威断点续练、本地进度恢复、模拟倒计时、主观题后端自评、阅读理解/案例分析多小题作答、错题/收藏复习、题目反馈、视频解析、练习/模考报告、收银台、订单详情和售后入口第一版；平台后台已接关键写操作、租户详情、账务资料编辑、平台员工列表/创建/编辑/禁用恢复、平台审计查询和 CSV 导出、开放审计告警展示/确认/解决、审计告警外部通知渠道/事件状态摘要、订阅账单候选预览/dry-run/批量生成、自动计费生成结果查看、逾期预览、催缴记录和催缴外部通知摘要第一版，租户工作台已接权限驱动模块入口，租户学生运营页已接创建/更新、禁用/恢复、批量导入、批量分班、备注和跟进任务第一版，租户内容页已接公共题库采纳/同步、冲突查看、单条/批量采纳平台或保留本地、导入问题、字段模板预览/下载、上传/粘贴预览、字段别名覆盖、同步/异步导入、异步轮询和复检详情第一版；租户设置页已接角色模板和成员绑定操作台第一版；租户营销中心已接 CRM 配置保存、队列筛选、分佣规则、成员比例、订单明细、结算生成/审核/标记线下打款、积分任务/兑换和积分风控摘要第一版 | 长题干/公式图片混排体验、更细数据范围 UI、平台审计告警升级策略、平台催缴通知配置操作台细节、小程序兼容验证和端到端测试 | +| Taro 前端 | 地基已建 | `apps/taro` 已有 Taro 4 React 工程、H5 三入口、租户解析、统一 API client、Supabase Auth client 初始化；学生端、租户后台和平台后台均已有第一批真实 API 页面；学生端已接地区选择、刷题答题卡、后端权威断点续练、本地进度恢复、模拟倒计时、主观题后端自评、阅读理解/案例分析多小题作答、错题/收藏复习、题目反馈、视频解析、练习/模考报告、收银台、订单详情和售后入口第一版；平台后台已接关键写操作、租户详情、账务资料编辑、平台员工列表/创建/编辑/禁用恢复、平台审计查询和 CSV 导出、开放审计告警展示/确认/解决、审计告警外部通知渠道/事件状态摘要、订阅账单候选预览/dry-run/批量生成、自动计费生成结果查看、逾期预览、催缴记录和催缴外部通知摘要第一版，租户工作台已接权限驱动模块入口，租户学生运营页已接创建/更新、禁用/恢复、批量导入、批量分班、备注、跟进任务、学习督导预览/生成和保存每日规则第一版，租户内容页已接公共题库采纳/同步、冲突查看、单条/批量采纳平台或保留本地、导入问题、字段模板预览/下载、上传/粘贴预览、字段别名覆盖、同步/异步导入、异步轮询和复检详情第一版；租户设置页已接角色模板和成员绑定操作台第一版；租户营销中心已接 CRM 配置保存、队列筛选、分佣规则、成员比例、订单明细、结算生成/审核/标记线下打款、积分任务/兑换和积分风控摘要第一版 | 男女预设头像选择 UI、长题干/公式图片混排体验、更细数据范围 UI、学习督导触达联动、平台审计告警升级策略、平台催缴通知配置操作台细节、小程序兼容验证和端到端测试 | ## 前端接入建议 diff --git a/docs/refactor/backend-progress.md b/docs/refactor/backend-progress.md index 8fb16b9b..793a5ce4 100644 --- a/docs/refactor/backend-progress.md +++ b/docs/refactor/backend-progress.md @@ -22,7 +22,7 @@ - 平台后台租户运营第一版已补齐：`GET /api/platform-admin/tenants/detail` 返回租户、域名、订阅、账单、用量和账务资料；`PUT /api/platform-admin/tenants/billing-profile` 维护开票/联系/银行掩码资料；`GET /api/platform-admin/audit-logs` 支持按租户、动作、目标、操作者、日期和关键词查询平台审计；`GET /api/platform-admin/audit-logs/export` 支持平台管理员导出 CSV/JSON，返回 base64 内容、sha256、行数和筛选条件，并对 `details` 中的 token/secret/password/key 等敏感字段递归脱敏，同时写入 `platform.audit.exported` 审计；`GET /api/platform-admin/audit-alert-rules`、`GET /api/platform-admin/audit-alerts` 和 `POST /api/platform-admin/audit-alerts/status` 支持平台内部审计告警规则查询、开放告警查询、确认/解决/忽略，API 返回告警 details 时递归脱敏敏感字段；`apps/worker --job platform-audit-alerts` 会把租户状态变更、账务资料变更、批量开票、逾期处理、手工收款确认、审计导出等高风险平台审计动作生成内部告警；`GET/PUT /api/platform-admin/audit-notification-channels` 和 `GET /api/platform-admin/audit-notification-events` 已支持平台审计告警外部通知渠道配置和发送事件查询，`apps/worker --job platform-audit-notifications` 可按渠道把开放告警推送到 generic/钉钉/飞书/企微 webhook，签名密钥进入 `app_private.platform_secrets`，API 只回显 `secretRef` 和 webhook host/path；`GET /api/platform-admin/invoices/subscription-candidates` 和 `POST /api/platform-admin/invoices/from-subscriptions-batch` 支持订阅账单候选预览、dry-run、批量生成、重复开票跳过和平台审计；`apps/worker --job platform-billing` 可自动为即将到期且未开票订阅生成服务费账单；`POST /api/platform-admin/invoices/process-overdue`、`GET /api/platform-admin/invoices/reminders` 和 `apps/worker --job platform-dunning` 可处理已逾期未结清服务费账单，写入内部催缴台账和审计；`GET/PUT /api/platform-admin/dunning-notification-channels`、`GET /api/platform-admin/dunning-notification-events` 和 `apps/worker --job platform-dunning-notifications` 已支持平台催缴外部通知渠道配置、发送事件查询、重试和幂等发送。创建租户、状态变更、账务资料维护、订阅批量开票、自动计费、逾期催缴、手工收款确认、审计导出、审计告警状态更新、审计告警通知渠道变更和催缴通知渠道变更会写入审计日志，API/worker 集成测试已覆盖平台管理员可操作、学生越权拒绝、重复保护、非法输入拒绝、敏感字段脱敏和审计记录存在。 - 租户自定义角色模板已落库：`tenant_role_templates` 支持权限、菜单、模块、字段和数据范围配置，成员可通过 `role_template_id` 绑定模板。 - 班级与学生范围权限已落库：`tenant_classes`、`tenant_class_members` 支持教师/班主任/助教/学生分组，教师按负责班级查看学生，字段权限可脱敏学生手机号。 -- 学生运营管理已落库：`tenant_student_notes`、`tenant_student_followups` 支持学生备注、家校/班主任/销售跟进任务、可见性、指派、完成状态和审计；批量学生 upsert、批量分班、禁用/恢复、学生批量 CRM 推送、跟进效果统计和学习督导自动化已接入权限校验、范围校验和集成测试。`GET /api/tenant-admin/students/followups/report` 支持 7/30/90 天或自定义日期范围、负责人/类型/班级筛选、状态/类型/优先级/负责人/班级聚合、每日趋势、逾期待办和 CRM 队列摘要，并会沿用教师班级范围与字段脱敏规则。`GET /api/tenant-admin/students/supervision/preview` 和 `POST /api/tenant-admin/students/supervision/generate` 支持按未学习、错题积压、低正确率、单词待复习和超期未完成练习生成风险候选，并用 `metadata.autoSupervision.idempotencyKey` 幂等生成 `learning` 跟进任务。 +- 学生运营管理已落库：`tenant_student_notes`、`tenant_student_followups`、`tenant_student_supervision_rules` 支持学生备注、家校/班主任/销售跟进任务、可见性、指派、完成状态、督导规则模板和审计；批量学生 upsert、批量分班、禁用/恢复、学生批量 CRM 推送、跟进效果统计和学习督导自动化已接入权限校验、范围校验和集成测试。`GET /api/tenant-admin/students/followups/report` 支持 7/30/90 天或自定义日期范围、负责人/类型/班级筛选、状态/类型/优先级/负责人/班级聚合、每日趋势、逾期待办和 CRM 队列摘要，并会沿用教师班级范围与字段脱敏规则。`GET /api/tenant-admin/students/supervision/preview` 和 `POST /api/tenant-admin/students/supervision/generate` 支持按未学习、错题积压、低正确率、单词待复习和超期未完成练习生成风险候选，并用 `metadata.autoSupervision.idempotencyKey` 幂等生成 `learning` 跟进任务；`GET/PUT /api/tenant-admin/students/supervision/rules` 支持租户保存手动/每日/每周督导策略，`apps/worker --job student-supervision` 会按启用规则定时生成跟进任务并写回 `last_result/next_run_at`。 - 旧题库常用运营功能已补齐一批：`exam_dates` 支持学生端考试倒计时和租户后台维护；`reports/report_status_events` 支持学生题目反馈、租户后台状态流转和 7/30/90 天只读反馈运营报表；`user_score_events` 支持每日签到积分流水、租户配置化连续签到奖励和反馈奖励幂等；`badges/user_badges` 支持租户后台勋章维护、手动发放、重复发放幂等和学生个人中心展示；`user_notifications` 支持反馈处理、反馈奖励、勋章发放和积分兑换的学生站内通知；Taro 学生个人中心已接积分任务/兑换/积分明细和消息中心第一版，租户营销中心已接反馈运营摘要、积分任务/每日签到奖励/兑换操作台和用户通知查看第一版。 - 旧题库排行榜主链路已补齐但租户默认关闭：`GET /api/learning/leaderboard` 只有在 `feature_flags.enableLeaderboard=true` 时可用，支持刷题、积分、背单词、模考四类指标，支持全量/7 天/30 天周期，以及租户/地区/班级范围。 - `learning` 已接入商用访问控制：免费用户每日题量、SVIP 范围、SVIP-only 内容、答题 session 快照保护由后端强制执行。 @@ -41,6 +41,7 @@ - 已新增分数线/视频 JSON 导入接口和集成测试：分数线支持字段、院校、专业、记录、动态字段值；视频支持视频元数据、资源引用、访问模式和题目绑定，全部复用 `content_import_jobs/items/issues` 管线。 - 已新增 CSV/Excel 导入解析层：题目、单词、知识手册、分数线和视频都可通过 `sourceFormat=csv/excel` 先解析为规范 payload，再进入同一套 preview/import、逐行 issue、幂等和审计管线；分数线支持多 Sheet Excel。 - 已新增 imports worker 和 `npm run test:worker:imports`：确认导入时可传 `executionMode=async`，API 将 preview job 排队为 `pending`，worker 复用同一导入 executor 消费任务，支持抢占锁、attempt/backoff、失败重试、清锁和审计。 +- 已新增 student-supervision worker 和 `npm run test:worker:student-supervision`：租户可保存学习督导规则模板，worker 使用规则行锁和 stale claim 保护抢占到期规则，复用 API 候选计算和跟进生成逻辑，按 `worker::<上海日期>` 幂等生成 `learning` 跟进任务，并写入成功/失败审计。 ## 已验证接口 @@ -297,7 +298,7 @@ GET /api/tenant-admin/audit-logs 2. 完成真实短信 provider 联调：阿里云/腾讯云，密钥放 `app_private.tenant_secrets` 或生产 Vault。 3. 完成真实 OAuth provider 联调：微信网页、微信小程序、QQ，确认回调域名、开放平台账号和旧 PocketBase 身份映射策略。 4. 补真实生产账单格式验收、前端财务操作台和营销活动 UI；支付/退款补偿、退款查询确认、退款通知、微信/支付宝官方账单下载、资金对账导入比对、差错工单、异常订单运营台和优惠券核销报表主链路已完成。 -5. 扩展 `apps/worker`：日报统计、CRM 死信告警、公共题库同步失败告警和更完整冲突处理运营台；公共题库同步 worker 和同步通知已具备基础闭环。 +5. 扩展 `apps/worker`：日报统计、CRM 死信告警、学习督导触达联动、公共题库同步失败告警和更完整冲突处理运营台；公共题库同步 worker、学习督导规则 worker 和同步通知已具备基础闭环。 6. 继续 Taro H5/小程序兼容验证，重点看公式、题图资源字段化、支付容器和分享链路。 ## 测试命令 @@ -314,5 +315,6 @@ npm run test:worker:platform-audit-notifications npm run test:worker:assets npm run test:worker:imports npm run test:worker:public-banks +npm run test:worker:student-supervision npm run check:refactor ``` diff --git a/docs/refactor/frontend-handoff-index.md b/docs/refactor/frontend-handoff-index.md index 445fe2b4..db982084 100644 --- a/docs/refactor/frontend-handoff-index.md +++ b/docs/refactor/frontend-handoff-index.md @@ -30,7 +30,7 @@ ## 当前可进入的前端工作 - `apps/taro` 已经建立，且学生端第一批 H5 页面已经可构建：登录、首页、地区选择、题库、练习、错题/收藏、练习报告、视频解析、会员收银台、订单详情、背单词、知识手册、分数线、资料、个人中心。 -- 租户后台第一批 H5 页面已经可构建：工作台、数据看板、学生/班级、题库内容、营销中心、财务运营、租户设置；工作台已接 `/api/tenant-admin/permissions` 做权限驱动模块入口；学生运营页已具备学生创建/更新、状态禁用/恢复、批量导入、批量分班、学生备注、跟进任务、跟进看板、学习督导自动化和 CRM 批量推送第一版；题库内容页已具备公共题库采纳/同步、同步通知、冲突查看、单条/批量采纳平台版本或保留本地版本、导入任务详情、异步轮询、导入问题查看、模板预览/下载、导入后复检详情、JSON/CSV/Excel 选择文件或粘贴内容、后端预览、字段别名覆盖和同步/异步执行导入的第一版操作能力；营销中心已具备 CRM 配置、CRM 队列查看、分佣规则、成员分佣比例、分佣订单、结算单生成/审核/标记打款、优惠券规则/核销报表、积分任务/兑换、积分风控只读摘要和用户通知查看第一版；财务运营页已具备退款申请/审核/供应商提交与查询、官方账单下载任务、对账批次/异常明细、差错工单处理、人工调整凭证提交/复核和异常订单运营台第一版；租户设置页已具备主题模板、草稿预览/发布、角色模板新建、编辑、停用、成员搜索/新建、成员绑定模板、成员状态和额外权限覆盖第一版。 +- 租户后台第一批 H5 页面已经可构建：工作台、数据看板、学生/班级、题库内容、营销中心、财务运营、租户设置；工作台已接 `/api/tenant-admin/permissions` 做权限驱动模块入口；学生运营页已具备学生创建/更新、状态禁用/恢复、批量导入、批量分班、学生备注、跟进任务、跟进看板、学习督导候选预览/生成、督导规则保存和 CRM 批量推送第一版；题库内容页已具备公共题库采纳/同步、同步通知、冲突查看、单条/批量采纳平台版本或保留本地版本、导入任务详情、异步轮询、导入问题查看、模板预览/下载、导入后复检详情、JSON/CSV/Excel 选择文件或粘贴内容、后端预览、字段别名覆盖和同步/异步执行导入的第一版操作能力；营销中心已具备 CRM 配置、CRM 队列查看、分佣规则、成员分佣比例、分佣订单、结算单生成/审核/标记打款、优惠券规则/核销报表、积分任务/兑换、积分风控只读摘要和用户通知查看第一版；财务运营页已具备退款申请/审核/供应商提交与查询、官方账单下载任务、对账批次/异常明细、差错工单处理、人工调整凭证提交/复核和异常订单运营台第一版；租户设置页已具备主题模板、草稿预览/发布、角色模板新建、编辑、停用、成员搜索/新建、成员绑定模板、成员状态和额外权限覆盖第一版。 - 平台后台第一批 H5 页面已经可构建：工作台、租户管理、账务中心、公共题库授权、平台员工；启动时应先接 `GET /api/platform-admin/permissions` 获取 `effective` 权限用于菜单和按钮可见性；租户管理页已接租户详情、账务资料编辑和最近平台审计，平台员工页已接员工列表、搜索、创建/编辑、权限点勾选、禁用和恢复，工作台已展示最近平台审计摘要、支持导出最近平台审计 CSV，并可查看开放审计告警、确认或解决告警，也能查看审计告警外部通知渠道、催缴外部通知渠道和最近发送事件摘要；账务中心已接订阅账单候选预览、dry-run、批量生成、自动计费生成结果查看、逾期预览、内部催缴生成和催缴记录查看。 - 可以继续复刻旧题库学生端主要视觉和交互：勋章展示、小程序端分享/支付体验、背单词更细统计和更完整复盘体验。地区选择、刷题答题卡、后端权威断点续练、本地进度恢复、模拟倒计时、主观题后端自评、阅读理解/案例分析多小题、题干/选项/解析 RichContent 安全渲染、视频解析、题目反馈、模考/练习报告逐题复盘、错题复习、收藏复习、背单词卡片学习/发音/收藏练习、商城收银台、订单详情和售后入口已经有第一版页面。 - 可以按新后端主模型接入内容导航： @@ -95,13 +95,13 @@ | --- | --- | --- | | 工作台 | `apps/taro/src/pages/tenant-admin/workbench/index.tsx` | `tenant-admin/overview`、`tenant-admin/dashboard`、`tenant-admin/permissions` | | 数据看板 | `apps/taro/src/pages/tenant-admin/dashboard/index.tsx` | `tenant-admin/dashboard` | -| 学生运营 | `apps/taro/src/pages/tenant-admin/students/index.tsx` | `tenant-admin/classes`、`tenant-admin/teachers`、`tenant-admin/students`、`students/bulk-upsert`、`students/status`、`classes/members/bulk-assign`、`students/notes`、`students/followups`、`students/followups/report`、`students/supervision/preview`、`students/supervision/generate`、`students/crm-push` | +| 学生运营 | `apps/taro/src/pages/tenant-admin/students/index.tsx` | `tenant-admin/classes`、`tenant-admin/teachers`、`tenant-admin/students`、`students/bulk-upsert`、`students/status`、`classes/members/bulk-assign`、`students/notes`、`students/followups`、`students/followups/report`、`students/supervision/preview`、`students/supervision/generate`、`students/supervision/rules`、`students/crm-push` | | 题库内容 | `apps/taro/src/pages/tenant-admin/content/index.tsx` | `tenant-content/content-entries`、`tenant-content/imports`、`imports/detail`、`imports/issues`、`imports/field-mapping`、`imports/templates`、`imports/post-check`、`tenant-content/exports/questions`、`tenant-content/exports/jobs`、`tenant-content/assets/sign-download`、`tenant-content/assets/sign-preview`、`tenant-content/assets/security-scan-events`、`tenant-content/public-question-banks`、`public-question-banks/adopt`、`public-question-banks/sync`、`public-question-banks/conflicts`、`public-question-banks/conflicts/resolve`、`public-question-banks/conflicts/resolve-batch`、`tenant-content/notifications`、`tenant-content/notifications/status` | | 营销中心 | `apps/taro/src/pages/tenant-admin/marketing/index.tsx` | `tenant-admin/coupons`、`code-batches`、`activation-codes`、`crm/config`、`crm/queue`、`commission/settings`、`member-rate`、`summary`、`orders`、`settlements`、`settlements/generate`、`settlements/status`、`tenant-admin/feedbacks/report`、`tenant-admin/point-activity-tasks`、`tenant-admin/point-activity-claims`、`tenant-admin/point-exchange-items`、`tenant-admin/point-exchange-orders`、`tenant-admin/points-risk-report`、`tenant-admin/user-notifications`；已接 CRM、分佣、优惠券规则/核销报表、反馈运营摘要、积分任务/兑换配置与记录查看、积分风控摘要、用户通知查看第一版 | | 财务运营 | `apps/taro/src/pages/tenant-admin/finance/index.tsx` | `commerce/refunds`、`commerce/refunds/status`、`commerce/operations/anomalies`、`commerce/reconciliation/batches`、`commerce/reconciliation/items`、`commerce/reconciliation/issues/create`、`commerce/reconciliation/issues`、`commerce/reconciliation/issues/status`、`commerce/reconciliation/provider-bills/request`、`commerce/reconciliation/provider-bills/jobs`、`commerce/adjustment-vouchers`、`commerce/adjustment-vouchers/status`、`commerce/adjustment-vouchers/report` | | 租户设置 | `apps/taro/src/pages/tenant-admin/settings/index.tsx` | `tenant-admin/overview`、`domains`、`payment-accounts`、`auth-providers`、`theme-templates`、`theme`、`theme/preview`、`theme/publish`、`permissions`、`GET/PUT role-templates`、`POST role-templates/disable`、`GET/PUT members`、`POST members/disable` | -当前租户后台已有第一批运营操作：工作台按权限矩阵隐藏不可见模块；学生运营页支持学生创建/更新、状态禁用/恢复、批量导入、批量分班、学生备注、跟进任务、完成跟进、跟进看板、学习督导候选预览/一键生成跟进任务和 CRM 入队推送；题库内容页支持公共题库采纳/同步、同步通知查看与已读/忽略、同步冲突查看、单条/批量采纳平台版本或保留本地版本、导入任务详情、异步 job 轮询、导入问题查看、字段映射/模板预览/下载、JSON/CSV/Excel 导入预览和执行、字段别名覆盖和导入后复检详情，也可接 JSON/试卷 payload 同步导出与 PDF/Word 异步导出 job 轮询，完成后用 `assetId` 走后台资源签名下载/预览；营销中心支持 CRM 配置保存、队列按状态查看、分佣规则、成员分佣比例、分佣订单明细、结算单生成、审核通过/驳回、标记线下打款、优惠券规则/核销报表、反馈运营摘要、积分任务/兑换配置、领取/兑换记录查看、积分风控只读摘要和用户通知查看第一版；财务运营页支持退款状态流、官方账单任务、对账异常、差错工单和调整凭证，且只通过后端命令层写审计与状态；租户设置页支持主题模板选择、草稿预览、发布、角色模板创建、编辑、停用、权限点、菜单、模块、字段、基础数据范围配置、成员搜索/新建、成员绑定模板、成员状态和额外权限覆盖。下一批需要继续补更精细的学生导入模板体验、更细数据范围 UI、主题素材库、真实打款 provider、发票、真实生产账单抽样验收和小程序端兼容。 +当前租户后台已有第一批运营操作：工作台按权限矩阵隐藏不可见模块；学生运营页支持学生创建/更新、状态禁用/恢复、批量导入、批量分班、学生备注、跟进任务、完成跟进、跟进看板、学习督导候选预览/一键生成跟进任务、保存每日督导规则和 CRM 入队推送；题库内容页支持公共题库采纳/同步、同步通知查看与已读/忽略、同步冲突查看、单条/批量采纳平台版本或保留本地版本、导入任务详情、异步 job 轮询、导入问题查看、字段映射/模板预览/下载、JSON/CSV/Excel 导入预览和执行、字段别名覆盖和导入后复检详情，也可接 JSON/试卷 payload 同步导出与 PDF/Word 异步导出 job 轮询，完成后用 `assetId` 走后台资源签名下载/预览；营销中心支持 CRM 配置保存、队列按状态查看、分佣规则、成员分佣比例、分佣订单明细、结算单生成、审核通过/驳回、标记线下打款、优惠券规则/核销报表、反馈运营摘要、积分任务/兑换配置、领取/兑换记录查看、积分风控只读摘要和用户通知查看第一版；财务运营页支持退款状态流、官方账单任务、对账异常、差错工单和调整凭证，且只通过后端命令层写审计与状态；租户设置页支持主题模板选择、草稿预览、发布、角色模板创建、编辑、停用、权限点、菜单、模块、字段、基础数据范围配置、成员搜索/新建、成员绑定模板、成员状态和额外权限覆盖。下一批需要继续补更精细的学生导入模板体验、更细数据范围 UI、学习督导触达联动/效果归因、主题素材库、真实打款 provider、发票、真实生产账单抽样验收和小程序端兼容。 ## 已落地的 Taro 平台后台页面 diff --git a/docs/refactor/implementation-status.md b/docs/refactor/implementation-status.md index 2a8d43ee..9b61f8c3 100644 --- a/docs/refactor/implementation-status.md +++ b/docs/refactor/implementation-status.md @@ -33,7 +33,7 @@ | 分数线 | 已建院校、专业、字段、记录表 | 已支持导入映射 | 字段、院校、专业、记录、趋势、年份、租户后台维护 API、JSON 预览导入已实现 | 核心 API 集成测试含导入断言 | 查询、后台维护和批量 JSON 导入基础闭环已实现，复杂动态筛选和 AI 择校上下文待补 | | 题目视频讲解 | 已建 `video_explanations`、`question_videos` | 已支持导入映射 | 单题视频、批量预加载、通用视频搜索、播放签名、视频次数扣减、播放水印上下文、租户后台视频创建绑定 API、JSON 预览导入已实现 | 核心 API 集成测试含播放、水印 traceId 和导入断言 | 播放、权益、后台绑定、动态水印上下文和批量 JSON 导入链路已实现，深度防盗链、转码级水印和播放统计待补 | | 资料下载/PDF | 已扩展 `content_assets`，新增资源台账和导入任务表 | 旧 `app_assets/images` 兼容导入 | 租户后台资源管理、OSS/COS/Supabase Storage 上传/下载签名、上传确认、PDF/图片预览签名、资源访问审计、动态水印上下文、内置安全扫描、外部 HTTP scanner 接入层、题库导出 PDF/Word/每日一练 ZIP 自动发布可信资源、学生端资料列表/下载权限已实现 | 核心 API 集成测试含 SVIP 资料下载、安全扫描门禁、水印 traceId，assets worker 覆盖内置规则与外部 scanner 通过/失败/不可用 fail-closed，exports worker 测试；Taro 类型检查覆盖学生资料水印预览/下载确认 | 资料资源基础闭环可跑，Taro 学生资料页已接短期签名、可见水印覆盖、追踪码展示和强制水印资源外部打开限制第一版；真实 AV/内容安全服务联调、CDN 防盗链、转码/CDN 级水印待补 | -| 个人中心 | 已建 `student_profiles`、会员权益、订单、练习记录、`badges/user_badges`、积分任务/兑换表、`user_notifications` | 已支持部分用户资料和勋章导入 | 个人资料、目标院校/专业、手机号绑定/换绑、会员状态、最近练习、统计聚合、签到积分、积分任务、积分兑换、题目反馈、考试倒计时、勋章和站内通知 API 已实现 | API 集成测试、Taro 类型检查 | 学生端个人中心已接学习报告、14 天趋势、题型表现、最近练习、积分任务/兑换/积分明细、消息中心、激活码和订单入口第一版；预设头像 UI、账号合并、更细学习建议和独立消息中心增强待补 | +| 个人中心 | 已建 `student_profiles`、会员权益、订单、练习记录、`badges/user_badges`、积分任务/兑换表、`user_notifications` | 已支持部分用户资料和勋章导入 | 个人资料、目标院校/专业、手机号绑定/换绑、会员状态、最近练习、统计聚合、签到积分、积分任务、积分兑换、题目反馈、考试倒计时、勋章和站内通知 API 已实现 | API 集成测试、Taro 类型检查 | 学生端个人中心已接学习报告、14 天趋势、题型表现、最近练习、积分任务/兑换/积分明细、消息中心、激活码和订单入口第一版；男女预设头像选择 UI、账号合并、更细学习建议和独立消息中心增强待补；不做头像上传或第三方头像同步 | | 活动/优惠 | 已建优惠券、激活码、激活码批次、banner、FAQ、公告、勋章、积分任务、积分兑换商品、兑换订单表和用户站内通知表 | 部分支持 | banner/FAQ/公告只读与租户后台维护、激活码预检查/兑换、激活码批次、批量生成激活码、优惠券维护、前台领取/下单抵扣、最低金额、优惠封顶、单用户限次、首单限制、适用套餐/地区、活动分组、核销明细、核销报表、勋章维护、手动发放、签到/积分/反馈/活动任务/练习/单词/模考自动发放、积分任务领取、积分兑换、优惠券兑换履约、积分风控只读报表和站内通知已实现 | 核心 API 集成测试 | Taro 租户营销中心已接优惠券、积分任务/兑换、积分风控摘要和用户通知查看第一版；营销自动化、外部订阅消息/短信和更完整活动效果看板继续补 | | 销售/代理客资追踪 | 已建推荐码、首绑客资、团队关系、小程序码缓存、CRM 队列 | 旧 `referral_tracks` 已有映射基础 | 邀请码、扫码/分享事件、首绑保护、销售统计、客资明细、手动补绑、团队关系、CRM 配置/队列、CRM worker 推送已实现 | 核心 API 集成测试、CRM worker 集成测试 | 增长链路基础可用，真实微信小程序码、CRM 分配策略、富卡片和销售转化看板待补 | | 租户后台 | 已建品牌、域名、设置、支付账户、登录 provider、私密密钥表、成员、审计日志、资源台账、导入台账、内容导航台账 | 不适用 | 概览、品牌、设置、域名、支付账户、登录配置、密钥掩码、活动内容、兑换码/优惠券、成员管理、权限矩阵、审计查询、角色模板权限/菜单/模块/字段/数据范围配置、内容入口/分类树/题目集合/练习蓝图维护、资源管理、题目/单词/知识手册/分数线/视频 JSON/CSV/Excel 同步/异步导入已实现 | 核心 API 集成测试含角色/权限/租户隔离/密钥不泄露/导航/组卷/资源与导入断言 | 租户配置与运营闭环可用；Taro 已接角色模板操作台、字段映射操作台和导入复检结果面板第一版；继续补成员绑定模板、权限驱动菜单和更细数据范围 UI | diff --git a/docs/refactor/legacy-feature-gap-matrix.md b/docs/refactor/legacy-feature-gap-matrix.md index f403b058..c263c934 100644 --- a/docs/refactor/legacy-feature-gap-matrix.md +++ b/docs/refactor/legacy-feature-gap-matrix.md @@ -31,7 +31,7 @@ | 知识手册 | `Handbook*.tsx` | 已覆盖 | Taro 已接手册科目/章节/条目、RichContent 安全渲染、H5 KaTeX 公式渲染和私有资源 ID 短签名地基第一版；后续补搜索、高亮、目录锚点、小程序公式真机验收和图片资源字段化 | | 分数线 | `ScorelinePage.tsx` | 已覆盖 | 动态字段/趋势、后台维护和 JSON 批量导入已有；后续补复杂筛选优化和 AI 择校数据上下文 | | 商城/SVIP | `Store.tsx`、`SvipModal.tsx` | 部分覆盖 | 套餐、订单、订单详情/状态轮询、权益、激活码预检查/兑换、优惠券领取/下单抵扣、微信支付/支付宝 provider 主链路、内部退款状态机、微信/支付宝发起退款、退款查询确认、退款通知 webhook、支付/退款补偿 worker、全额退款权益撤销、资金对账手工/API 导入比对、微信/支付宝官方账单下载 worker、异常查询、差错工单和事件轨迹、异常订单运营台、人工调整凭证复核报表已有；Taro 学生收银台/订单详情和租户财务运营台第一版已接；仍缺更完整售后体验、真实生产账单抽样验收和生产账号联调 | -| 个人中心 | `Profile.tsx` | 部分覆盖 | 基本资料、手机号绑定/换绑、男女预设头像、权益、订单统计、练习历史、学习统计、签到积分、积分活动任务、积分兑换、考试倒计时、趋势、勋章展示和站内通知 API 已有；Taro 个人中心已接学习报告、积分任务、积分兑换、积分明细、消息筛选/已读/归档第一版；后端登录和导入链路不会保存微信/QQ/旧系统头像 URL；继续补账号合并、更细学习建议和预设头像 UI 接入 | +| 个人中心 | `Profile.tsx` | 部分覆盖 | 基本资料、手机号绑定/换绑、男女预设头像、权益、订单统计、练习历史、学习统计、签到积分、积分活动任务、积分兑换、考试倒计时、趋势、勋章展示和站内通知 API 已有；Taro 个人中心已接学习报告、积分任务、积分兑换、积分明细、消息筛选/已读/归档第一版；后端登录和导入链路不会保存微信/QQ/旧系统头像 URL，产品不支持学生头像上传；继续补账号合并、更细学习建议和男女预设头像选择 UI | | 资料下载 | `QuestionExporterPublishModal.tsx` 等 | 部分覆盖 | 资源台账、上传确认、签名下载、PDF/图片预览、动态水印上下文、Taro 学生端水印 traceId 预览/下载确认、worker 复检、内置安全扫描和外部 HTTP scanner 接入层已有；仍缺深度防盗链、真实 AV/内容安全服务联调、转码/CDN 级水印和生命周期策略 | | AI 择校推荐 | 业务规划新增 | 部分覆盖 | 已有 SVIP 门禁、学生输入 schema、地区/分数线上下文、稳定 JSON 输出、报告台账、审计和 Taro 学生端基础页；真实 AI provider、prompt 版本管理后台、报告 PDF 渲染和更细推荐算法待补 | | 题目反馈 | `02-API接口.md` 用户反馈 | 部分覆盖 | 学生提交、本人列表、租户后台处理、状态事件、反馈奖励积分、站内通知和租户反馈运营聚合报表已覆盖；Taro 个人中心消息中心可查看反馈处理/奖励通知，租户营销中心已接 30 天反馈运营摘要；仍缺外部订阅消息/短信提醒和内容修复闭环 | @@ -42,7 +42,7 @@ | 旧功能/组件 | 新后端状态 | 待补齐 | | --- | --- | --- | -| 用户管理 | 已覆盖 | 租户成员、学生列表、学生资料、批量学生 upsert、禁用/恢复、批量分班、学生备注、跟进任务、跟进效果统计、学习督导自动化预览/生成和批量 CRM 推送已实现；后续补更细导入模板体验、更细数据范围 UI 和运营策略配置 | +| 用户管理 | 已覆盖 | 租户成员、学生列表、学生资料、批量学生 upsert、禁用/恢复、批量分班、学生备注、跟进任务、跟进效果统计、学习督导自动化预览/生成、督导规则模板、定时生成 worker 和批量 CRM 推送已实现；后续补更细导入模板体验、更细数据范围 UI、触达联动和效果归因 | | 销售/代理管理 | 部分覆盖 | referral/team/stats 已有；分佣设置、订单/激活码归因、结算单生成、审核、打款状态、CSV/JSON 导出、打款凭证登记/复核和本人/全局权限范围已覆盖；还缺真实打款 provider、发票、批量凭证上传和分佣看板 | | 班级/教师管理 | 已覆盖 | 班级、班级成员、教师/班主任/助教/学生范围权限已有；可视化 UI 和更细数据范围组合待补 | | 数据看板 | 部分覆盖 | 租户 dashboard 聚合 API 已覆盖收益、注册、答题、活跃、题型、科目、题量、套餐销量、运营动态、24h 活跃和激活码使用；后续补预聚合 worker、销售转化和分佣结算看板 | @@ -98,7 +98,7 @@ 1. 阅读理解/案例分析多小题：后端 `subAnswers` 判分、断点恢复、报告 `subResults`、Taro 作答 UI、RichContent 长题干/图片/H5 KaTeX 公式渲染、私有资源 ID 短签名题图和逐题复盘第一版已完成；仍需补小程序公式真机验收、题图资源字段化和更细复盘交互。 2. 排行榜增强：刷题、模考、背单词、积分排行榜主接口已有，租户默认关闭；还需防刷、日/周榜预聚合、运营后台排名看板和开启前压测。 -3. 账号设置完整流：绑定/更换手机号基础 API 和预设头像契约已完成；仍缺微信/QQ 账号合并、密码/邮箱能力和预设头像页面 UI 接入。 +3. 账号设置完整流：绑定/更换手机号基础 API 和预设头像契约已完成；仍缺微信/QQ 账号合并、密码/邮箱能力和男女预设头像选择 UI 接入。头像上传、头像裁剪和第三方头像同步不做。 4. 题库导出：服务端 JSON/试卷 payload、PDF/Word 二进制生成、水印、资料发布路径、权限审计、答案脱敏、每日一练基础导出和图片 ZIP 素材包已补；仍缺更精细试卷模板和后台导出操作台体验。 5. 导入扩展：题目/单词/知识手册/分数线/视频已支持 JSON、CSV 和 Excel 预览导入，并可用 `executionMode=async` 进入 imports worker；导入后复检、导入任务详情、模板下载按钮、字段映射 API、Taro 字段别名编辑、异步轮询和 PocketBase JSON dry-run 报告已补，仍缺真实数据执行验收。 6. 公共题库商业化：平台公共/地区题库授权、租户快照采纳、手动同步、自动同步 worker、同步通知、冲突查询、租户自改冲突保护和单条/批量冲突处理已完成基础闭环；还需生产定时调度、失败告警和更完整运营后台消息。 @@ -127,6 +127,6 @@ ### P2：增强体验 1. 素材库、更多主题模板和可视化细节编辑。 -2. 班级、教师、学生分组的更细数据范围 UI 和学习督导策略配置。 +2. 班级、教师、学生分组的更细数据范围 UI、学习督导触达联动和效果归因。 3. AI 择校推荐和 PDF 报告。 4. 题库导出模板精排、多模板排版和运营操作台。 diff --git a/docs/refactor/next-development-todo.md b/docs/refactor/next-development-todo.md index d5add053..48808c6e 100644 --- a/docs/refactor/next-development-todo.md +++ b/docs/refactor/next-development-todo.md @@ -20,7 +20,7 @@ - 内容导入：题目、单词、知识手册、分数线、视频 JSON/CSV/Excel 预览、校验、导入、幂等、审计。 - 内容导出：题库 JSON、`paper_json`、打印 payload 导出基础已完成，支持集合/入口/分类范围、导出 job、审计、跨租户拒绝、答案/解析开关和复合题子题脱敏。 - 租户组织范围：班级、班级成员、教师/班主任/助教/学生分组，教师按负责班级查看学生，字段权限可脱敏学生手机号。 -- 学生运营管理：学生批量 upsert、禁用/恢复、批量分班、备注、跟进任务、跟进效果统计、学习督导自动化、批量 CRM 推送已完成接口和集成测试；学生写入口已拒绝头像 URL、第三方头像字段和 `primaryRole`，学生头像统一走男女预设；Taro 租户学生运营页已接学生创建/更新、状态切换、批量导入、批量分班、备注、跟进任务、跟进看板、学习督导预览/生成和 CRM 推送第一版；后续补督导规则模板、周期任务、触达联动和更细导入模板体验。 +- 学生运营管理：学生批量 upsert、禁用/恢复、批量分班、备注、跟进任务、跟进效果统计、学习督导自动化、督导规则模板、定时生成 worker、批量 CRM 推送已完成接口和集成测试；学生写入口已拒绝头像 URL、第三方头像字段和 `primaryRole`，学生头像统一走男女预设；Taro 租户学生运营页已接学生创建/更新、状态切换、批量导入、批量分班、备注、跟进任务、跟进看板、学习督导预览/生成、保存每日督导规则和 CRM 推送第一版；后续补督导触达联动、效果归因和更细导入模板体验。 - 旧题库运营缺口已补一批：考试日期/倒计时、题目反馈/纠错处理、反馈运营聚合报表、每日签到积分和积分流水、学习排行榜已完成接口和集成测试但租户默认关闭。 - 勋章管理已完成租户后台维护、手动发放、重复发放幂等、学生个人中心展示、权限点和集成测试；签到连续天数、积分阈值、反馈解决、积分活动任务、练习次数、单词掌握和模考成绩自动发放已完成并纳入 API 集成测试；自动/手动发放会写入用户站内通知。学生激励以后台配置勋章自动发放为主，不默认启用排行榜竞争。后续补更细活动效果看板和更细前端运营配置体验。 - 积分活动和兑换第一阶段已完成：租户后台可配置积分任务/兑换商品并查看领取/兑换记录，学生端可查询任务、领取奖励、查看兑换商品、兑换并生成 `redeem_cost` 积分流水；优惠券兑换会生成 `coupon_redemptions`，手工/自定义商品进入待履约订单；兑换完成或待履约会写入用户站内通知；Taro 学生个人中心已接积分任务、兑换商品和积分明细第一版，租户营销中心已接积分任务/兑换操作台、反馈运营摘要和积分风控只读摘要第一版。后续补更细活动效果看板。 @@ -161,8 +161,9 @@ 12. 学生运营管理 - 已完成学生列表、学生资料维护、班级分组、教师范围可见、学生批量导入、禁用/恢复、批量分班、学生备注、跟进任务、跟进效果统计和批量 CRM 推送；学生写入口拒绝头像 URL、第三方头像字段和 `primaryRole`，避免绕过预设头像与租户角色体系。 - 已完成学习督导自动化第一版：后端按未学习、错题积压、低正确率、单词待复习和超期未完成练习预览风险学生，并幂等生成 `learning` 跟进任务；教师账号沿用班级范围，手机号按字段权限脱敏，生成动作写审计。 - - 已完成 Taro 学生运营页第一版：学生创建/更新、状态禁用/恢复、批量导入、批量分班、备注、跟进任务、完成跟进、跟进看板、学习督导候选预览/生成和 CRM 入队推送。 - - 继续补督导规则模板、定时自动生成、和 CRM/站内通知/企微/飞书/钉钉的触达联动、督导效果归因，以及更细导入模板体验。 + - 已完成督导规则模板和定时生成 worker：`GET/PUT /api/tenant-admin/students/supervision/rules` 支持保存手动/每日/每周规则，`apps/worker --job student-supervision` 复用后端候选计算和幂等生成逻辑，写回 `lastResult/nextRunAt` 和审计。 + - 已完成 Taro 学生运营页第一版：学生创建/更新、状态禁用/恢复、批量导入、批量分班、备注、跟进任务、完成跟进、跟进看板、学习督导候选预览/生成、保存每日督导规则和 CRM 入队推送。 + - 继续补 CRM/站内通知/企微/飞书/钉钉的触达联动、督导效果归因，以及更细导入模板体验。 13. AI 择校推荐 - 已完成 `ai_recommendation_reports` 报告台账、SVIP 门禁、学生输入 schema、地区/分数线上下文、`local_rules` 稳定 JSON 输出、报告列表/详情接口和 Taro 学生端基础页。 @@ -202,7 +203,7 @@ - 旧原生小程序前端位于 `F:\project\参考\旧题库小程序前端文件`，后续 Taro 小程序/H5 交互补齐时只作为交互、页面状态和微信平台能力参考，不继承旧直连 PocketBase 或旧鉴权逻辑。 - 租户通过域名、小程序配置或启动参数解析。 - 页面主题、品牌、功能开关都从后端租户配置读取；学生端和后台只消费 `/api/tenant/resolve` 的已发布 `branding.theme/publicAssets`，租户后台草稿只通过 `/api/tenant-admin/theme` 查看。 -- 当前已完成 H5 学生端、租户后台、平台后台三套构建入口和统一 API client；学生端、租户后台、平台后台都有第一批真实 API 页面；学生端已补地区选择、刷题答题卡、后端权威断点续练、本地进度恢复、模拟倒计时、主观题后端自评、阅读理解/案例分析多小题、错题/收藏复习、题目反馈、视频解析、练习/模考报告、个人中心学习报告可视化、会员收银台、订单详情、售后入口、站内消息中心第一版、积分任务/兑换/积分明细第一版、预设头像契约、题干/选项/解析/知识手册 RichContent 安全渲染、H5 KaTeX 公式渲染、私有资源 ID 题图短签名渲染、逐题复盘、背单词卡片学习/发音/收藏练习第一版；平台后台已接入创建租户、租户详情、状态变更、账务资料维护、平台员工列表/创建/编辑/禁用恢复、平台审计查询/CSV 导出、开放审计告警展示/确认/解决、审计告警外部通知渠道/事件状态摘要、催缴外部通知渠道/事件摘要、订阅、订阅账单候选/dry-run/批量生成、自动计费生成结果查看、收款、用量和公共题库授权第一版写操作；租户后台已接权限驱动工作台、学生运营操作台、学习督导自动化、主题模板预览/发布、角色模板、成员绑定、CRM/分佣操作台、积分任务/兑换操作台和用户通知查看第一版；下一步补预设头像 UI、小程序公式真机验收、题图资源字段化、独立消息中心增强、状态管理、更细数据范围 UI、督导策略配置和小程序兼容验证。 +- 当前已完成 H5 学生端、租户后台、平台后台三套构建入口和统一 API client；学生端、租户后台、平台后台都有第一批真实 API 页面；学生端已补地区选择、刷题答题卡、后端权威断点续练、本地进度恢复、模拟倒计时、主观题后端自评、阅读理解/案例分析多小题、错题/收藏复习、题目反馈、视频解析、练习/模考报告、个人中心学习报告可视化、会员收银台、订单详情、售后入口、站内消息中心第一版、积分任务/兑换/积分明细第一版、预设头像契约、题干/选项/解析/知识手册 RichContent 安全渲染、H5 KaTeX 公式渲染、私有资源 ID 题图短签名渲染、逐题复盘、背单词卡片学习/发音/收藏练习第一版；平台后台已接入创建租户、租户详情、状态变更、账务资料维护、平台员工列表/创建/编辑/禁用恢复、平台审计查询/CSV 导出、开放审计告警展示/确认/解决、审计告警外部通知渠道/事件状态摘要、催缴外部通知渠道/事件摘要、订阅、订阅账单候选/dry-run/批量生成、自动计费生成结果查看、收款、用量和公共题库授权第一版写操作；租户后台已接权限驱动工作台、学生运营操作台、学习督导自动化/每日规则保存、主题模板预览/发布、角色模板、成员绑定、CRM/分佣操作台、积分任务/兑换操作台和用户通知查看第一版；下一步补男女预设头像选择 UI、小程序公式真机验收、题图资源字段化、独立消息中心增强、状态管理、更细数据范围 UI、督导触达联动和小程序兼容验证。 ### 第一批页面 @@ -255,7 +256,7 @@ ## 推荐下一步顺序 1. 补租户后台写操作台：公共题库采纳/同步、冲突查看、单条/批量冲突采纳平台或保留本地、导入问题、模板预览/下载、上传/粘贴 preview/import、字段映射编辑、异步导入轮询、导入后复检详情、权限驱动工作台、学生创建/更新/批量导入/批量分班/备注/跟进、角色模板配置、成员绑定模板、CRM 配置/队列/跟进分配策略、分佣规则/成员比例/结算生成审核打款/导出/凭证复核已接第一版；继续补成员批量运营、更细数据范围 UI、真实打款 provider 和发票。 -2. 继续补 Taro 学生端旧体验：地区选择、刷题答题卡、后端权威断点续练、本地进度恢复、模拟倒计时、主观题后端自评、阅读理解/案例分析多小题、视频播放、反馈、模考报告、逐题复盘、错题/收藏专题、个人中心学习报告、预设头像契约、收银台、订单详情、售后入口、站内消息筛选/已读/归档、积分任务/兑换/积分明细、题干/解析/知识手册 RichContent 安全渲染、H5 KaTeX 公式渲染、私有资源 ID 题图短签名、背单词卡片学习/发音/收藏练习、资料短签名水印预览/下载确认已接第一版；继续补预设头像 UI、小程序公式真机验收、题图资源字段化、独立消息中心增强、背单词更细统计、小程序支付容器、分享场景和状态管理。 +2. 继续补 Taro 学生端旧体验：地区选择、刷题答题卡、后端权威断点续练、本地进度恢复、模拟倒计时、主观题后端自评、阅读理解/案例分析多小题、视频播放、反馈、模考报告、逐题复盘、错题/收藏专题、个人中心学习报告、预设头像契约、收银台、订单详情、售后入口、站内消息筛选/已读/归档、积分任务/兑换/积分明细、题干/解析/知识手册 RichContent 安全渲染、H5 KaTeX 公式渲染、私有资源 ID 题图短签名、背单词卡片学习/发音/收藏练习、资料短签名水印预览/下载确认已接第一版；继续补男女预设头像选择 UI、小程序公式真机验收、题图资源字段化、独立消息中心增强、背单词更细统计、小程序支付容器、分享场景和状态管理。前端不得实现头像上传、头像裁剪或第三方头像同步。 3. 补平台后台增强：租户基础资料编辑增强、平台审计告警升级策略、平台催缴通知配置操作台细节和平台在线收款。 4. 云服务器部署 Supabase/PostgreSQL 和 API，配置对象存储生产环境变量，跑 `check:refactor` 的远程等价测试。 5. 使用 `F:\project\参考\旧题库数据库文件` 中的真实 PocketBase 数据，按 `docs/refactor/pocketbase-real-data-migration-runbook.md` 继续做人工复核和抽样验收；当前 dry-run/导入/校验链路已跑通，下一步重点是 7 个已支付缺用户订单、22 个待复核手册章节、2533 道旧分类缺失题目和 5298 条引用已删除题目的答题记录的运营处理结论。导入过程中发现的字段污染、跨集合引用断裂、敏感字段和旧权限问题都要沉淀到 importer mapper 或修复脚本，不手工临时修库。 diff --git a/docs/refactor/taro-frontend-integration.md b/docs/refactor/taro-frontend-integration.md index 754bb75f..a88ddacc 100644 --- a/docs/refactor/taro-frontend-integration.md +++ b/docs/refactor/taro-frontend-integration.md @@ -276,7 +276,7 @@ tenant::theme | 学生备注 | `GET/PUT /api/tenant-admin/students/notes` | | 学生跟进任务 | `GET/PUT /api/tenant-admin/students/followups` | | 学生跟进看板 | `GET /api/tenant-admin/students/followups/report?timeRange=30d&classId=...` | -| 学习督导自动化 | `GET /api/tenant-admin/students/supervision/preview?classId=...`、`POST /api/tenant-admin/students/supervision/generate` | +| 学习督导自动化 | `GET /api/tenant-admin/students/supervision/preview?classId=...`、`POST /api/tenant-admin/students/supervision/generate`、`GET/PUT /api/tenant-admin/students/supervision/rules` | | 租户教师 | `GET /api/tenant-admin/teachers` | | 租户考试日期 | `GET/PUT /api/tenant-admin/exam-dates` | | 租户反馈处理 | `GET /api/tenant-admin/feedbacks`、`GET /api/tenant-admin/feedbacks/report`、`POST /api/tenant-admin/feedbacks/status`、`GET /api/tenant-admin/feedbacks/events` | @@ -1481,7 +1481,7 @@ content_entries - 学生批量导入和批量分班接口会返回 `total/successCount/errorCount/results`，前端必须展示逐行错误，不要在浏览器端静默丢弃失败行。学生导入模板不要提供头像 URL 或 `primaryRole` 字段；后端会拒绝这类字段，学生头像统一由个人中心 `avatarPreset` 控制。 - 学生批量 CRM 推送统一调用 `POST /api/tenant-admin/students/crm-push`，请求包含 `studentUserIds/title/message/followupType/priority/assignedToUserId/classId/dueAt/idempotencyKey`。前端不要直接写 `crm_webhook_queue`，也不要持有 webhook 密钥；后端会校验 `crm:write`、学生范围、班级范围、指派人租户成员和幂等键，并返回逐行 `queueId/followupId/errors`。 - 学生跟进看板统一调用 `GET /api/tenant-admin/students/followups/report`，不要由前端直接读取 `tenant_student_followups` 或 `crm_webhook_queue` 后自行聚合。该接口支持 `timeRange=7d|30d|90d` 或 `startDate/endDate`、`assignedToUserId`、`followupType`、`classId` 和 `limit`，返回 `summary/crmQueue/byStatus/byType/byPriority/byAssignee/byClass/dailyTrend/overdueItems`；后端会沿用当前账号的租户权限、教师班级范围和手机号脱敏规则。 -- 学习督导自动化统一走后端 `preview -> generate`：先调用 `GET /api/tenant-admin/students/supervision/preview` 预览候选学生和风险原因，再调用 `POST /api/tenant-admin/students/supervision/generate` 幂等生成 `learning` 跟进任务。前端不要直接读取 `answer_records`、`wrong_questions`、`user_word_progress`、`practice_sessions` 或 `tenant_student_followups.metadata` 自行计算风险；后端会统一执行 `students:supervision:read/write` 权限、教师班级范围、学生手机号字段脱敏和审计。 +- 学习督导自动化统一走后端 `preview -> generate -> rules`：先调用 `GET /api/tenant-admin/students/supervision/preview` 预览候选学生和风险原因，再调用 `POST /api/tenant-admin/students/supervision/generate` 幂等生成 `learning` 跟进任务；需要周期执行时用 `GET/PUT /api/tenant-admin/students/supervision/rules` 查询或保存督导规则模板。规则支持 `manual/daily/weekly`、阈值配置、班级范围、负责人和每次生成上限，后端会为 scoped 教师/班主任强制班级范围；`apps/worker --job student-supervision` 会按启用规则定时生成跟进任务并写回 `lastResult/nextRunAt`。前端不要直接读取 `answer_records`、`wrong_questions`、`user_word_progress`、`practice_sessions`、`tenant_student_supervision_rules` 或 `tenant_student_followups.metadata` 自行计算风险或改规则状态；后端会统一执行 `students:supervision:read/write` 权限、教师班级范围、学生手机号字段脱敏和审计。 - 教师可以为范围内学生创建备注和跟进任务，但是否能禁用学生、批量导入、查看手机号由后端权限和字段权限决定；前端只按返回值渲染。 - H5 自定义域名下要注意缓存隔离，不能把 A 租户主题缓存用到 B 租户。 diff --git a/package.json b/package.json index e5151c55..67bf56b0 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "test:worker:exports": "npm run db:smoke-seed && npm run build:worker && node scripts/export-worker-integration-test.js", "test:worker:imports": "npm run db:smoke-seed && npm run build:worker && node scripts/import-worker-integration-test.js", "test:worker:public-banks": "npm run db:smoke-seed && npm run build:worker && node scripts/public-bank-worker-integration-test.js", + "test:worker:student-supervision": "npm run db:smoke-seed && npm run build:worker && node scripts/student-supervision-worker-integration-test.js", "test:rls": "npm run db:smoke-seed && node scripts/rls-tenant-isolation-test.js", "test:readiness": "node scripts/production-readiness-check-test.js && node scripts/production-config-failfast-test.js && node --import tsx scripts/taro-runtime-config-test.js && node --import tsx scripts/taro-api-auth-mode-test.js && node scripts/remote-auth-jwt-smoke-test.js && node scripts/production-launch-gate-test.js", "test:auth:remote-smoke": "node scripts/remote-auth-jwt-smoke-test.js", diff --git a/scripts/api-integration-test.js b/scripts/api-integration-test.js index 0ddc7c12..239a63a3 100644 --- a/scripts/api-integration-test.js +++ b/scripts/api-integration-test.js @@ -9426,6 +9426,57 @@ async function testTenantStudentOperations() { 'supervision generation should be idempotent for the same batch and student', ); + const supervisionRule = await request('/api/tenant-admin/students/supervision/rules', { + userId: TENANT_TEACHER_USER_ID, + method: 'PUT', + body: { + name: '集成测试教师班级督导规则', + classId: ids.tenantClass, + status: 'active', + rules: { + inactivityDays: 1, + wrongQuestionThreshold: 1, + minAnswers: 1, + lowAccuracyThreshold: 0.99, + vocabularyDueThreshold: 1, + }, + schedule: { + enabled: true, + frequency: 'daily', + hour: 9, + minute: 0, + }, + limit: 5, + }, + }); + assert.ok(supervisionRule.item?.id, 'teacher should create class-scoped supervision rule'); + assert.equal(supervisionRule.item?.classId, ids.tenantClass, 'supervision rule should bind scoped class'); + assert.ok(supervisionRule.item?.nextRunAt, 'active scheduled supervision rule should compute next run time'); + + const supervisionRules = await request('/api/tenant-admin/students/supervision/rules', { + userId: TENANT_TEACHER_USER_ID, + query: { limit: 20 }, + }); + assert.equal(supervisionRules.scoped, true, 'teacher supervision rule list should be scoped'); + assert.ok( + supervisionRules.items?.some(item => item.id === supervisionRule.item.id), + 'teacher should list own scoped supervision rule', + ); + + const teacherGlobalSupervisionRuleDenied = await request('/api/tenant-admin/students/supervision/rules', { + userId: TENANT_TEACHER_USER_ID, + method: 'PUT', + body: { + name: '不应保存全局规则', + status: 'active', + rules: { inactivityDays: 1 }, + schedule: { enabled: true, frequency: 'daily' }, + limit: 5, + }, + expectStatus: 403, + }); + assert.equal(teacherGlobalSupervisionRuleDenied.code, 'CLASS_SCOPE_REQUIRED', 'teacher should not create global supervision rules'); + const teacherOtherSupervisionDenied = await request('/api/tenant-admin/students/supervision/generate', { userId: TENANT_TEACHER_USER_ID, method: 'POST', @@ -9446,6 +9497,13 @@ async function testTenantStudentOperations() { }); assert.equal(operatorSupervisionDenied.code, 'TENANT_PERMISSION_REQUIRED', 'operator without supervision permission should be denied'); + const operatorSupervisionRuleDenied = await request('/api/tenant-admin/students/supervision/rules', { + userId: TENANT_OPERATOR_USER_ID, + query: { limit: 5 }, + expectStatus: 403, + }); + assert.equal(operatorSupervisionRuleDenied.code, 'TENANT_PERMISSION_REQUIRED', 'operator without supervision permission should not list rules'); + const teacherOtherFollowupDenied = await request('/api/tenant-admin/students/followups', { userId: TENANT_TEACHER_USER_ID, method: 'PUT', @@ -9504,6 +9562,7 @@ async function testTenantStudentOperations() { assert.ok(auditLogs.items?.some(item => item.action === 'tenant.student_note.upserted'), 'audit logs should include student note upsert'); assert.ok(auditLogs.items?.some(item => item.action === 'tenant.student_followup.upserted'), 'audit logs should include student follow-up upsert'); assert.ok(auditLogs.items?.some(item => item.action === 'tenant.students.supervision_generated'), 'audit logs should include supervision generation'); + assert.ok(auditLogs.items?.some(item => item.action === 'tenant.students.supervision_rule_upserted'), 'audit logs should include supervision rule upsert'); } async function testReferralAndCrmGrowth() { diff --git a/scripts/student-supervision-worker-integration-test.js b/scripts/student-supervision-worker-integration-test.js new file mode 100644 index 00000000..6ee75a97 --- /dev/null +++ b/scripts/student-supervision-worker-integration-test.js @@ -0,0 +1,209 @@ +import assert from 'node:assert/strict'; +import pg from 'pg'; +import { spawn } from 'node:child_process'; + +const databaseUrl = process.env.DATABASE_URL || 'postgresql://postgres:postgres@127.0.0.1:54322/postgres'; +const MAIN_TENANT_ID = '00000000-0000-0000-0000-000000000001'; +const TENANT_CLASS_ID = '00000000-0000-0000-0000-000000000851'; +const STUDENT_USER_ID = '00000000-0000-0000-0000-000000000101'; + +const ids = { + rule: '00000000-0000-0000-0000-00000000d701', + disabledRule: '00000000-0000-0000-0000-00000000d702', +}; + +function runWorkerOnce() { + const child = spawn(process.execPath, ['apps/worker/dist/apps/worker/src/index.js', '--once', '--job', 'student-supervision'], { + cwd: process.cwd(), + env: { + ...process.env, + DATABASE_URL: databaseUrl, + WORKER_STUDENT_SUPERVISION_BATCH_SIZE: '10', + WORKER_STUDENT_SUPERVISION_ID: 'student-supervision-integration-test', + }, + stdio: ['ignore', 'pipe', 'pipe'], + windowsHide: true, + }); + let output = ''; + child.stdout.on('data', chunk => { + output += chunk.toString(); + }); + child.stderr.on('data', chunk => { + output += chunk.toString(); + }); + return new Promise((resolve, reject) => { + child.on('error', reject); + child.on('exit', code => { + try { + assert.equal(code, 0, `worker should exit 0\n${output}`); + assert.match(output, /student-supervision batch processed=\d+/, 'worker output should include student supervision summary'); + resolve(output); + } catch (error) { + reject(error); + } + }); + }); +} + +async function cleanup(pool) { + await pool.query( + ` + delete from public.tenant_student_followups + where tenant_id = $1 + and ( + metadata->'autoSupervision'->>'ruleId' in ($2, $3) + or metadata->>'ruleId' in ($2, $3) + ) + `, + [MAIN_TENANT_ID, ids.rule, ids.disabledRule], + ); + await pool.query('delete from public.audit_logs where tenant_id = $1 and target_id in ($2, $3)', [MAIN_TENANT_ID, ids.rule, ids.disabledRule]); + await pool.query('delete from public.tenant_student_supervision_rules where tenant_id = $1 and id in ($2, $3)', [MAIN_TENANT_ID, ids.rule, ids.disabledRule]); +} + +async function createRules(pool) { + await pool.query( + ` + insert into public.tenant_student_supervision_rules ( + id, tenant_id, name, status, rules, schedule, + class_id, assigned_to_user_id, limit_count, metadata, next_run_at + ) + values ( + $1, $2, 'worker 学习督导集成测试', 'active', + $3::jsonb, $4::jsonb, + $5, null, 5, '{"source":"student-supervision-worker-test"}'::jsonb, + now() - interval '1 minute' + ) + `, + [ + ids.rule, + MAIN_TENANT_ID, + JSON.stringify({ + inactivityDays: 1, + wrongQuestionThreshold: 1, + minAnswers: 1, + lowAccuracyThreshold: 0.99, + vocabularyDueThreshold: 1, + }), + JSON.stringify({ + enabled: true, + frequency: 'daily', + hour: 9, + minute: 0, + timezone: 'Asia/Shanghai', + }), + TENANT_CLASS_ID, + ], + ); + await pool.query( + ` + insert into public.tenant_student_supervision_rules ( + id, tenant_id, name, status, rules, schedule, + class_id, assigned_to_user_id, limit_count, metadata, next_run_at + ) + values ( + $1, $2, 'disabled worker 学习督导集成测试', 'disabled', + $3::jsonb, $4::jsonb, + $5, null, 5, '{"source":"student-supervision-worker-test"}'::jsonb, + now() - interval '1 minute' + ) + `, + [ + ids.disabledRule, + MAIN_TENANT_ID, + JSON.stringify({ inactivityDays: 1 }), + JSON.stringify({ enabled: true, frequency: 'daily', hour: 9, minute: 0 }), + TENANT_CLASS_ID, + ], + ); +} + +async function main() { + const pool = new pg.Pool({ connectionString: databaseUrl }); + try { + await cleanup(pool); + await createRules(pool); + + const firstOutput = await runWorkerOnce(); + assert.match(firstOutput, /processed=1/, 'worker should process the active due supervision rule'); + assert.match(firstOutput, /generated=1/, 'worker should generate follow-up tasks for the active rule'); + assert.match(firstOutput, /failed=0/, 'worker should not fail active supervision rule'); + + const rule = await pool.query( + ` + select last_run_at, next_run_at, last_result, metadata + from public.tenant_student_supervision_rules + where tenant_id = $1 and id = $2 + `, + [MAIN_TENANT_ID, ids.rule], + ); + assert.ok(rule.rows[0]?.last_run_at, 'worker should record last_run_at'); + assert.ok(rule.rows[0]?.next_run_at, 'worker should compute next_run_at'); + assert.equal(rule.rows[0]?.last_result?.status, 'completed', 'worker should record successful last_result'); + assert.equal(rule.rows[0]?.metadata?.studentSupervisionWorker?.lastStatus, 'completed', 'worker metadata should record completion'); + + const followups = await pool.query( + ` + select id, student_user_id, followup_type, status, metadata + from public.tenant_student_followups + where tenant_id = $1 + and metadata->'autoSupervision'->>'ruleId' = $2 + `, + [MAIN_TENANT_ID, ids.rule], + ); + assert.ok(followups.rowCount >= 1, 'worker should create at least one supervision follow-up'); + assert.ok( + followups.rows.some(row => row.student_user_id === STUDENT_USER_ID), + 'worker follow-up should include risky smoke student', + ); + assert.ok(followups.rows.every(row => row.followup_type === 'learning'), 'worker follow-ups should use learning type'); + assert.ok(followups.rows.every(row => row.status === 'open'), 'worker follow-ups should start open'); + + const disabled = await pool.query( + ` + select last_run_at + from public.tenant_student_supervision_rules + where tenant_id = $1 and id = $2 + `, + [MAIN_TENANT_ID, ids.disabledRule], + ); + assert.equal(disabled.rows[0]?.last_run_at, null, 'worker should not process disabled supervision rules'); + + const secondOutput = await runWorkerOnce(); + assert.match(secondOutput, /processed=0/, 'second worker run should not process rule before next_run_at'); + const followupCount = await pool.query( + ` + select count(*)::integer as count + from public.tenant_student_followups + where tenant_id = $1 + and metadata->'autoSupervision'->>'ruleId' = $2 + `, + [MAIN_TENANT_ID, ids.rule], + ); + assert.equal(Number(followupCount.rows[0]?.count), followups.rowCount, 'second worker run should not duplicate follow-ups'); + + const audit = await pool.query( + ` + select action, details + from public.audit_logs + where tenant_id = $1 + and target_id = $2 + and action = 'tenant.students.supervision_rule_worker_completed' + order by created_at desc + limit 1 + `, + [MAIN_TENANT_ID, ids.rule], + ); + assert.equal(audit.rows[0]?.details?.workerId, 'student-supervision-integration-test', 'worker audit should record worker id'); + + console.log('Student supervision worker integration test complete.'); + } finally { + await cleanup(pool).catch(() => {}); + await pool.end(); + } +} + +main().catch(error => { + console.error(error); + process.exit(1); +}); diff --git a/supabase/migrations/202606300014_student_supervision_rules.sql b/supabase/migrations/202606300014_student_supervision_rules.sql new file mode 100644 index 00000000..0c1d4e6c --- /dev/null +++ b/supabase/migrations/202606300014_student_supervision_rules.sql @@ -0,0 +1,44 @@ +create table if not exists public.tenant_student_supervision_rules ( + id uuid primary key default gen_random_uuid(), + tenant_id uuid not null references public.tenants(id) on delete cascade, + name text not null, + status text not null default 'active' + check (status in ('active', 'disabled', 'archived')), + rules jsonb not null default '{}'::jsonb, + schedule jsonb not null default '{}'::jsonb, + class_id uuid references public.tenant_classes(id) on delete set null, + assigned_to_user_id uuid references public.platform_users(id) on delete set null, + limit_count integer not null default 20 check (limit_count between 1 and 100), + metadata jsonb not null default '{}'::jsonb, + last_run_at timestamptz, + next_run_at timestamptz, + last_result jsonb not null default '{}'::jsonb, + created_by uuid references public.platform_users(id) on delete set null, + updated_by uuid references public.platform_users(id) on delete set null, + created_at timestamptz not null default now(), + updated_at timestamptz not null default now() +); + +comment on table public.tenant_student_supervision_rules is + 'Tenant-scoped learning supervision rule templates used by admins and workers to generate student follow-up tasks.'; + +create index if not exists idx_student_supervision_rules_tenant_status + on public.tenant_student_supervision_rules(tenant_id, status, next_run_at nulls first, created_at desc); + +create index if not exists idx_student_supervision_rules_worker_due + on public.tenant_student_supervision_rules(status, next_run_at nulls first) + where status = 'active'; + +alter table public.tenant_student_supervision_rules enable row level security; + +drop policy if exists tenant_isolation on public.tenant_student_supervision_rules; +create policy tenant_isolation on public.tenant_student_supervision_rules + for all + using (tenant_id = app.current_tenant_id() or app.is_platform_admin()) + with check (tenant_id = app.current_tenant_id() or app.is_platform_admin()); + +drop trigger if exists set_updated_at on public.tenant_student_supervision_rules; +create trigger set_updated_at + before update on public.tenant_student_supervision_rules + for each row + execute function app.touch_updated_at();