## P0:双通道项目重复发布跳分(45→85→收敛) results.rank 一列同时充当「个人名次输出」「手工名次输入」「榜单数据源」, 团体手工通道把个人名次当团体名次又按团体表发一遍分。 - 新增 channel_ranks(每个计分通道各自持久化名次,发布时全量重建) 与 channel_manual_ranks(按单位录入的团体手工名次,故意不挂通道外键, 避免规则包重导时级联删掉录入数据) - results.rank 语义收窄为「只表示个人名次」,只由 scope=athlete 通道写回; 团体手工名次的来源改为 TeamRanks 优先、团体报名项兜底, 个人报名项的名次绝不进团体通道 - writeLedgerTx 内重建 channel_ranks;buildRanked / export.loadRanked / realtime.loadRanked 三份同源 SQL 一起改读新表 - 回归:发布两次流水与名次逐字节一致(domain + httpapi 各一条,含变异验证) ## 奖牌结算开关与奖牌通道(P1(5),新功能) - events.award_medals + 通道 count_to_medals / count_to_team_medals (迁移默认 1,升级不改变既有榜单) - 单位榜入选 = 小项结算奖牌 && 通道发奖牌 && 前三名 &&(团体项目 || 个人奖牌并入单位) - 个人榜只取个人通道;金牌榜与积分榜同源同数据、按通道过滤独立计算 - 前端:小项「该项启用奖牌结算」、通道「发奖牌/个人奖牌并入单位金牌榜」、 录入页新增「团体名次」区块(含新接口 GET/PUT .../team-ranks) ## 身份口径改回证件号(P1(15),推翻第三十六轮) - 匹配顺序恢复 证件号 → 号码布 → 姓名+单位;新增 athleteByIDCard - 同表重复证件号 = 同一人报多个组别(notices 提示,不报错); 只有「同证件号 + 同小项同组别」才是真重复(conflicts[].duplicate) - 补齐后端缺失但前端/文档已在依赖的三处契约 ## 其余 P1 - 安全:会话撤销断开 ws、实时层按角色裁剪、整库快照限流(含 hello 路径, 被限流的请求挂起并由心跳兜底补发,不丢刷新) - 错误分级:手填名次非正数 / gender / 组别年龄 / 导出不存在的小项与单位 / 积分模板 awardRanks → 400 或 404,不再 500 - 算分一致性:破纪录加分看得失状态;批量退赛·恢复·移出、作废成绩、 报名导入改状态一律无条件重算推榜(不受延迟结算约束,与实时模式逐字节等价) - 配置改动触发重算:通道 / 小项参数 / 积分模板 - 升级自愈:channel_ranks 空而已有已发布成绩时,启动时一次性全量重算 (服务对外监听之前完成,避免升级后奖牌榜全 0) - 示例数据模式下破坏性操作被阻断,不再假成功 - Console:修复「只剩一块屏」后屏幕监听器被永久摘掉 - 大屏模板引擎:嵌套深度与体积安全阀,任何输入都不抛异常 ## 文档 - docs/:使用手册(奖牌开关、奖牌通道、团体名次、枚举列留空口径)、 常见问题(奖牌排查、升级后奖牌榜为 0、历史重放已知限制)、 部署指南、上线检查清单 - 版本 dev_0.1.7 → dev_0.1.8(console/package.json 同步) 自检:服务端 13 包 ×2 全绿;前端 vue-tsc + 449 例 ×2 + pnpm build; Console 35 例 + 语法检查。
300 lines
8.3 KiB
Go
300 lines
8.3 KiB
Go
package rules
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"git.yeij.top/AskaEth/Scoreboard/server/internal/domain"
|
|
)
|
|
|
|
// EventInfo 是展开通道模板所需的最小项目信息。
|
|
type EventInfo struct {
|
|
ID int64
|
|
Code string
|
|
Name string
|
|
SportCode string
|
|
EventType domain.EventType
|
|
ResultType domain.ResultType
|
|
Scored bool
|
|
Multiplier float64
|
|
AwardMedals bool
|
|
Channels []Channel
|
|
}
|
|
|
|
// Snapshot 是赛事库当前的规则状态:规则包 + 项目目录。
|
|
// 差异预览需要项目目录才能把 channelTemplates 展开到具体项目。
|
|
type Snapshot struct {
|
|
Pack *RulePack
|
|
Events []EventInfo
|
|
}
|
|
|
|
// EventByCode 按项目编码查找项目。
|
|
func (s *Snapshot) EventByCode(code string) (EventInfo, bool) {
|
|
for _, e := range s.Events {
|
|
if e.Code == code {
|
|
return e, true
|
|
}
|
|
}
|
|
return EventInfo{}, false
|
|
}
|
|
|
|
// Load 从赛事库读取当前规则状态。规则包元数据(meta)库里不存,保持为空。
|
|
func Load(db *sql.DB) (*Snapshot, error) {
|
|
pack := &RulePack{
|
|
Format: FormatName,
|
|
FormatVersion: FormatVersion,
|
|
}
|
|
|
|
profileByID, profiles, err := loadProfiles(db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
pack.Profiles = profiles
|
|
|
|
settings, err := loadSettings(db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
pack.Standings = standingsFromSettings(settings)
|
|
pack.RecordBonus = recordBonusFromSettings(settings)
|
|
pack.ManualAdjustment = manualAdjustmentFromSettings(settings)
|
|
|
|
events, err := loadEvents(db, profileByID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// 库里只有逐项目的通道、没有模板表,因此导出时把「有通道/不计分/不结算奖牌/权重非 1」的项目
|
|
// 全部写成 eventOverrides,保证「导出 → 导入」能还原当前配置。
|
|
for _, e := range events {
|
|
needOverride := len(e.Channels) > 0 || !e.Scored || !e.AwardMedals || e.Multiplier != 1
|
|
if !needOverride {
|
|
continue
|
|
}
|
|
ov := EventOverride{EventCode: e.Code, Name: e.Name}
|
|
if !e.Scored {
|
|
ov.Scored = BoolPtr(false)
|
|
}
|
|
if e.Multiplier != 1 {
|
|
ov.Multiplier = Float64Ptr(e.Multiplier)
|
|
}
|
|
if !e.AwardMedals {
|
|
ov.AwardMedals = BoolPtr(false)
|
|
}
|
|
if len(e.Channels) > 0 {
|
|
ov.Channels = ChannelListPtr(append([]Channel(nil), e.Channels...))
|
|
}
|
|
pack.EventOverrides = append(pack.EventOverrides, ov)
|
|
}
|
|
|
|
canonical := pack.Canonical()
|
|
return &Snapshot{Pack: &canonical, Events: events}, nil
|
|
}
|
|
|
|
// Export 从赛事库生成规则包;meta 由调用方提供(库里不存规则包元数据)。
|
|
func Export(db *sql.DB, meta Meta) (*RulePack, error) {
|
|
snap, err := Load(db)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
pack := *snap.Pack
|
|
pack.Meta = meta
|
|
if strings.TrimSpace(pack.Meta.Code) == "" {
|
|
pack.Meta.Code = "exported-rules"
|
|
}
|
|
if strings.TrimSpace(pack.Meta.Name) == "" {
|
|
if name, err := settingByKey(db, "event.name"); err == nil && strings.TrimSpace(name) != "" {
|
|
pack.Meta.Name = name
|
|
} else {
|
|
pack.Meta.Name = "未命名赛事 · 积分规则"
|
|
}
|
|
}
|
|
canonical := pack.Canonical()
|
|
return &canonical, nil
|
|
}
|
|
|
|
func loadProfiles(db *sql.DB) (map[int64]string, []Profile, error) {
|
|
rows, err := db.Query(`SELECT id, code, name, tie_mode, record_bonus_mode, award_ranks, last_place_zero
|
|
FROM scoring_profiles ORDER BY code`)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("查询积分模板: %w", err)
|
|
}
|
|
defer func() { _ = rows.Close() }()
|
|
|
|
byID := map[int64]string{}
|
|
byCode := map[string]int{}
|
|
var profiles []Profile
|
|
for rows.Next() {
|
|
var (
|
|
id, awardRanks int64
|
|
code, name string
|
|
tie, bonus string
|
|
lastPlaceZeroRaw int
|
|
)
|
|
if err := rows.Scan(&id, &code, &name, &tie, &bonus, &awardRanks, &lastPlaceZeroRaw); err != nil {
|
|
return nil, nil, fmt.Errorf("读取积分模板: %w", err)
|
|
}
|
|
byID[id] = code
|
|
byCode[code] = len(profiles)
|
|
profiles = append(profiles, Profile{
|
|
Code: code,
|
|
Name: name,
|
|
AwardRanks: int(awardRanks),
|
|
LastPlaceZero: lastPlaceZeroRaw != 0,
|
|
TieMode: domain.TieMode(tie),
|
|
RecordBonusMode: domain.RecordBonusMode(bonus),
|
|
})
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, nil, fmt.Errorf("读取积分模板: %w", err)
|
|
}
|
|
|
|
ruleRows, err := db.Query(`SELECT profile_id, rank, points FROM scoring_profile_rules ORDER BY profile_id, rank`)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("查询积分模板明细: %w", err)
|
|
}
|
|
defer func() { _ = ruleRows.Close() }()
|
|
|
|
for ruleRows.Next() {
|
|
var (
|
|
profileID int64
|
|
rank int
|
|
points float64
|
|
)
|
|
if err := ruleRows.Scan(&profileID, &rank, &points); err != nil {
|
|
return nil, nil, fmt.Errorf("读取积分模板明细: %w", err)
|
|
}
|
|
code, ok := byID[profileID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
idx := byCode[code]
|
|
profiles[idx].Rules = append(profiles[idx].Rules, Rule{Rank: rank, Points: points})
|
|
}
|
|
if err := ruleRows.Err(); err != nil {
|
|
return nil, nil, fmt.Errorf("读取积分模板明细: %w", err)
|
|
}
|
|
return byID, profiles, nil
|
|
}
|
|
|
|
func loadSettings(db *sql.DB) (map[string]string, error) {
|
|
rows, err := db.Query(`SELECT key, value FROM settings`)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("查询赛事设置: %w", err)
|
|
}
|
|
defer func() { _ = rows.Close() }()
|
|
|
|
out := map[string]string{}
|
|
for rows.Next() {
|
|
var k, v string
|
|
if err := rows.Scan(&k, &v); err != nil {
|
|
return nil, fmt.Errorf("读取赛事设置: %w", err)
|
|
}
|
|
out[k] = v
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("读取赛事设置: %w", err)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func settingByKey(db *sql.DB, key string) (string, error) {
|
|
var value string
|
|
if err := db.QueryRow(`SELECT value FROM settings WHERE key = ?`, key).Scan(&value); err != nil {
|
|
return "", err
|
|
}
|
|
return value, nil
|
|
}
|
|
|
|
func loadEvents(db *sql.DB, profileByID map[int64]string) ([]EventInfo, error) {
|
|
rows, err := db.Query(`SELECT e.id, e.code, e.name, s.code, e.event_type, e.result_type, e.scored, e.multiplier, e.award_medals
|
|
FROM events e JOIN sports s ON s.id = e.sport_id
|
|
ORDER BY e.sort_order, e.code`)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("查询项目: %w", err)
|
|
}
|
|
defer func() { _ = rows.Close() }()
|
|
|
|
events := []EventInfo{}
|
|
index := map[int64]int{}
|
|
for rows.Next() {
|
|
var (
|
|
id int64
|
|
code, name string
|
|
sportCode string
|
|
eventType string
|
|
resultType string
|
|
scoredRaw int
|
|
multiplier float64
|
|
awardMedalsRaw int
|
|
)
|
|
if err := rows.Scan(&id, &code, &name, &sportCode, &eventType, &resultType, &scoredRaw, &multiplier, &awardMedalsRaw); err != nil {
|
|
return nil, fmt.Errorf("读取项目: %w", err)
|
|
}
|
|
index[id] = len(events)
|
|
events = append(events, EventInfo{
|
|
ID: id,
|
|
Code: code,
|
|
Name: name,
|
|
SportCode: sportCode,
|
|
EventType: domain.EventType(eventType),
|
|
ResultType: domain.ResultType(resultType),
|
|
Scored: scoredRaw != 0,
|
|
Multiplier: multiplier,
|
|
AwardMedals: awardMedalsRaw != 0,
|
|
})
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("读取项目: %w", err)
|
|
}
|
|
|
|
chRows, err := db.Query(`SELECT c.event_id, c.scope, c.basis, p.code, c.sort_order, c.count_to_team, c.count_to_medals, c.count_to_team_medals
|
|
FROM event_score_channels c JOIN scoring_profiles p ON p.id = c.profile_id
|
|
ORDER BY c.event_id, c.sort_order, c.id`)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("查询计分通道: %w", err)
|
|
}
|
|
defer func() { _ = chRows.Close() }()
|
|
|
|
for chRows.Next() {
|
|
var (
|
|
eventID int64
|
|
scope string
|
|
basis string
|
|
code string
|
|
sortOrd int
|
|
countToTeam int
|
|
countToMedals int
|
|
countToTeamMedals int
|
|
)
|
|
if err := chRows.Scan(&eventID, &scope, &basis, &code, &sortOrd, &countToTeam, &countToMedals, &countToTeamMedals); err != nil {
|
|
return nil, fmt.Errorf("读取计分通道: %w", err)
|
|
}
|
|
idx, ok := index[eventID]
|
|
if !ok {
|
|
continue
|
|
}
|
|
ch := Channel{
|
|
Scope: domain.Scope(scope),
|
|
Basis: domain.Basis(basis),
|
|
Profile: code,
|
|
}
|
|
// 只把显式关闭的通道写成 false:导出文件里不出现缺省值,往返比对才不会凭空多出差异。
|
|
if countToTeam == 0 {
|
|
ch.CountToTeam = BoolPtr(false)
|
|
}
|
|
if countToMedals == 0 {
|
|
ch.CountToMedals = BoolPtr(false)
|
|
}
|
|
if countToTeamMedals == 0 {
|
|
ch.CountToTeamMedals = BoolPtr(false)
|
|
}
|
|
events[idx].Channels = append(events[idx].Channels, ch)
|
|
}
|
|
if err := chRows.Err(); err != nil {
|
|
return nil, fmt.Errorf("读取计分通道: %w", err)
|
|
}
|
|
return events, nil
|
|
}
|