fix: 修掉十路审查发现的 9 个 P0 与一批 P1(数据正确性 / 越权 / 现场可用性)
P0(9 条全修): - 多通道项目奖牌重复计数:domain 层按 (EventID,CategoryID,EntryID/Subject) 去重, 通道优先级 athlete→team→id - 「只排名不计分」项目(scored:false)不再进奖牌榜,REST/WS/导出口径统一 - aggregate 流水 entry_id 恒 NULL 导致重算后分数翻倍:作废范围改按 event+category 定位 - 已发布成绩仍可被「存草稿」覆盖并清空 rank:服务端 409 STATE_INVALID + 前端禁编辑 - voidResult / 规则导入重算后名次不回写:接住 Ranked 调 applyComputedRanks - 赛事包覆盖导入可能「旧项目已删、新项目没成」:先改名成功再清理,失败回滚 - 导入赛事包可覆盖正在运行的赛事目录:name==当前项目直接 400 - Console spawn 失败后守护器永久卡死:清 child/pid + 调度重启 + stop 超时兜底 - /ws 快照向非 admin 下发 admin-only 配置:按角色裁剪 settings P1(计分口径 / 契约 / 现场): - standings.tieBreak 三处接线;profiles[].recordBonusMode 生效;破纪录校验 RecordEligible 与 entry 归属;破纪录登记校验已发布成绩 - export.loadRanked 与主路径对齐;ListBackups reason 解析;CLI backup 前缀修正 (原来只增不减会撑爆磁盘);单位积分明细/导出统一权重折算;停用单位展示 - 规则导入原子化(重算并入同一事务)+ 返回 compatible/affectedEventCount/ recalculatedLedgerRows;登录审计 user_id 修正 - WS 策略性断开用 Close(code,reason);HelloMessage 补 page/instanceId; 实例注册表清理;settings/单位/项目写操作补 change_log 触发大屏刷新 - 大屏:全量快照不再被版本守卫丢弃;个人积分榜刷新;公告返回页/轮播;行数截断; REST 竞态;1008 停止重连;握手超时;时区补 Z;401 仅 AUTH_REQUIRED 才登出 - 管理端:published 行禁编辑;saveDraft 补 unit(1:06.33 显示);前端预览改用服务端 points;空成绩行不再恒「已修改」;修订详情按 id 拉取;切项目请求序号与 dirty 保护; 发布后刷新项目状态;NAV/路由按角色过滤;recorder 不再打 admin-only 接口 - Console:大屏窗口销毁后重建;大屏 URL 复用 host 归一化;backup.bat 改纯 ASCII (已在 Meowhome 实跑验证) 自检:服务端 gofmt/build/vet 通过、12 包测试全绿;前端 vue-tsc + build 通过、 node --test 24/24;console check-syntax 12 文件通过。
This commit is contained in:
1 parent
96cf181ae3
commit
13f1f03cd0
124 files changed
+5658
-1820
No files matched your search
@@ -204,14 +204,77 @@ func buildTeamRow(t Team, p TeamPoints, m medalTally) StandingsRow {
|
||||
}
|
||||
}
|
||||
|
||||
// channelBefore 是计分通道的优先级比较(口径固定,必须确定性):
|
||||
// 个人通道优先于团体通道;同为个人/团体时取通道 id 小者。
|
||||
// 奖牌去重与破纪录口径共用这套优先级,保证同一份输入每次选出同一个通道。
|
||||
func channelBefore(scopeA Scope, idA int64, scopeB Scope, idB int64) bool {
|
||||
if scopeA != scopeB {
|
||||
return scopeA == ScopeAthlete
|
||||
}
|
||||
return idA < idB
|
||||
}
|
||||
|
||||
// medalKey 是奖牌去重键:同一报名项在同一小项、同一组别只记一枚奖牌。
|
||||
// 聚合通道不对应单条报名项(EntryID=0),改用名次主体(个人/单位)去重。
|
||||
type medalKey struct {
|
||||
eventID int64
|
||||
categoryID int64
|
||||
entryID int64
|
||||
scope Scope
|
||||
subject int64
|
||||
unique int // 退化数据(EntryID 与主体都为空)没有可识别身份,按输入顺序各占一个键
|
||||
}
|
||||
|
||||
// medalKeyOf 计算一条名次明细的去重键;index 用于给无法识别主体的退化数据兜底。
|
||||
func medalKeyOf(rr RankedResult, index int) medalKey {
|
||||
k := medalKey{eventID: rr.EventID, categoryID: rr.CategoryID, entryID: rr.EntryID}
|
||||
if k.entryID != 0 {
|
||||
return k
|
||||
}
|
||||
k.scope = rr.Scope
|
||||
if rr.Scope == ScopeAthlete {
|
||||
k.subject = rr.AthleteID
|
||||
} else {
|
||||
k.subject = rr.TeamID
|
||||
}
|
||||
if k.subject == 0 {
|
||||
k.unique = index + 1
|
||||
}
|
||||
return k
|
||||
}
|
||||
|
||||
// pickMedalChannels 把按通道展开的名次明细去重成「每个报名项一条」:
|
||||
// 只保留优先级最高的通道名次,否则双通道项目一条成绩会拿两枚奖牌。
|
||||
func pickMedalChannels(ranked []RankedResult, excludeTeam bool) []RankedResult {
|
||||
best := make(map[medalKey]RankedResult, len(ranked))
|
||||
order := make([]medalKey, 0, len(ranked))
|
||||
for i, rr := range ranked {
|
||||
if excludeTeam && rr.Scope == ScopeTeam {
|
||||
continue
|
||||
}
|
||||
k := medalKeyOf(rr, i)
|
||||
cur, ok := best[k]
|
||||
if !ok {
|
||||
best[k] = rr
|
||||
order = append(order, k)
|
||||
continue
|
||||
}
|
||||
if channelBefore(rr.Scope, rr.ChannelID, cur.Scope, cur.ChannelID) {
|
||||
best[k] = rr
|
||||
}
|
||||
}
|
||||
out := make([]RankedResult, 0, len(order))
|
||||
for _, k := range order {
|
||||
out = append(out, best[k])
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// teamMedals 统计团体奖牌榜。联队拆分时两个单位各记一枚:
|
||||
// 联合组队拿到的名次对每个成员单位都是「本单位取得的名次」。
|
||||
func teamMedals(in StandingsInput) map[int64]medalTally {
|
||||
out := make(map[int64]medalTally)
|
||||
for _, rr := range in.Ranked {
|
||||
if rr.Scope == ScopeTeam && in.ExcludeTeamEventMedals {
|
||||
continue
|
||||
}
|
||||
for _, rr := range pickMedalChannels(in.Ranked, in.ExcludeTeamEventMedals) {
|
||||
medal := rankMedal(rr.Rank)
|
||||
if medal == 0 {
|
||||
continue
|
||||
@@ -235,7 +298,7 @@ func teamMedals(in StandingsInput) map[int64]medalTally {
|
||||
// athleteMedals 只统计个人项目(scope=athlete)的奖牌。
|
||||
func athleteMedals(in StandingsInput) map[int64]medalTally {
|
||||
out := make(map[int64]medalTally)
|
||||
for _, rr := range in.Ranked {
|
||||
for _, rr := range pickMedalChannels(in.Ranked, false) {
|
||||
if rr.Scope != ScopeAthlete || rr.AthleteID == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user