口径(用户确认): - 个人分按个人成绩排名给,**不计入单位总分**(下沉到通道级开关,不再动全局系数) - 团体成绩 = 每队成员成绩的**平均值** → 排名(并列顺延)→ 团体模板给分 → 计入单位总分 - 平均值口径是**小项级单选项**:默认「只算有效成绩」;「全部报名人员计入」= 分母为报名条数、 没成绩按 0 加入分子;在**成绩录入页**就地切换并立即保存 服务端: - 迁移 0017:score_ledger 加 count_to_team(重建,无子表);event_score_channels 加 count_to_team; events 加 avg_mode(默认 valid) - 规则包 Channel 加 countToTeam(缺省 true);channelTemplates 支持 individual_team → 默认 athlete(result, 不计入单位) + team(aggregate 队内平均) - 计分引擎:SumByTeam 跳过 count_to_team=0 的流水;实现 basis=aggregate 的队内平均团体排名 (valid 分母=有有效成绩人数;all 分母=报名人数;某队 0 有效成绩不参与) 前端: - 计分通道页:每行通道「计入单位总分」勾选 + basis 下拉「按队内平均」 - 成绩录入页:仅有队内平均通道的小项显示「平均值口径」单选(默认只算有效成绩),改动即存 - 录入页「实时积分预览」按新口径对齐(原先按主体求和且双通道重复计入,与发布后不一致) - 大屏/管理端团体成绩只显示数值,不出现「平均」字样 自检:服务端 12 包全绿;前端 vue-tsc + build、node --test 134/134;console 16 文件通过。
272 lines
7.5 KiB
Go
272 lines
7.5 KiB
Go
package rules
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"sort"
|
|
)
|
|
|
|
// ChangeKind 是差异类型。
|
|
type ChangeKind string
|
|
|
|
const (
|
|
ChangeAdded ChangeKind = "added"
|
|
ChangeModified ChangeKind = "modified"
|
|
ChangeRemoved ChangeKind = "removed"
|
|
)
|
|
|
|
// ProfileChange 是一个积分模板的增/改/删。
|
|
type ProfileChange struct {
|
|
Code string `json:"code"`
|
|
Kind ChangeKind `json:"kind"`
|
|
Before *Profile `json:"before,omitempty"`
|
|
After *Profile `json:"after,omitempty"`
|
|
// Fields 列出被修改的字段,便于前端只高亮变化项。
|
|
Fields []string `json:"fields,omitempty"`
|
|
}
|
|
|
|
// ChannelChange 是一个项目计分通道的变化。
|
|
type ChannelChange struct {
|
|
EventCode string `json:"eventCode"`
|
|
EventName string `json:"eventName,omitempty"`
|
|
Kind ChangeKind `json:"kind"`
|
|
Before []Channel `json:"before,omitempty"`
|
|
After []Channel `json:"after,omitempty"`
|
|
}
|
|
|
|
// SettingChange 是一条赛事设置的变化。
|
|
type SettingChange struct {
|
|
Key string `json:"key"`
|
|
Before string `json:"before"`
|
|
After string `json:"after"`
|
|
}
|
|
|
|
// ChangeSet 是导入预览的结果,也是 Apply 的输入。
|
|
type ChangeSet struct {
|
|
Profiles []ProfileChange `json:"profiles,omitempty"`
|
|
Channels []ChannelChange `json:"channels,omitempty"`
|
|
Settings []SettingChange `json:"settings,omitempty"`
|
|
// UnknownEvents 是规则包里出现、但赛事库中不存在的项目编码;Apply 会跳过它们。
|
|
UnknownEvents []string `json:"unknownEvents,omitempty"`
|
|
// Next 是目标规则包;Apply 以它为完整目标状态落库。不参与 JSON 序列化。
|
|
Next *RulePack `json:"-"`
|
|
}
|
|
|
|
// Empty 判断这次导入是否真的会改动任何东西。
|
|
// 只用于预览展示;Apply 始终以 Next 为目标全量同步,不依赖它做短路。
|
|
func (cs *ChangeSet) Empty() bool {
|
|
return cs == nil || (len(cs.Profiles) == 0 && len(cs.Channels) == 0 && len(cs.Settings) == 0)
|
|
}
|
|
|
|
// Diff 计算「当前赛事库 → 目标规则包」的差异,只读不落库。
|
|
func Diff(cur *Snapshot, next *RulePack) (*ChangeSet, error) {
|
|
if cur == nil || cur.Pack == nil {
|
|
return nil, errors.New("rules: 当前快照为空,无法比对差异")
|
|
}
|
|
if next == nil {
|
|
return nil, fmt.Errorf("%w: 目标规则包为空", ErrNotRulePack)
|
|
}
|
|
|
|
target := next.Canonical()
|
|
if err := target.Validate(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
cs := &ChangeSet{Next: &target}
|
|
cs.Profiles = diffProfiles(cur.Pack, &target)
|
|
|
|
targets, unknown, err := resolveTargets(cur, &target)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cs.UnknownEvents = unknown
|
|
cs.Channels = diffChannels(cur, targets)
|
|
cs.Settings = diffSettings(cur.Pack, &target)
|
|
return cs, nil
|
|
}
|
|
|
|
func diffProfiles(cur, next *RulePack) []ProfileChange {
|
|
curIndex := cur.ProfileIndex()
|
|
nextIndex := next.ProfileIndex()
|
|
|
|
codes := make([]string, 0, len(curIndex)+len(nextIndex))
|
|
seen := map[string]bool{}
|
|
for code := range curIndex {
|
|
if !seen[code] {
|
|
seen[code] = true
|
|
codes = append(codes, code)
|
|
}
|
|
}
|
|
for code := range nextIndex {
|
|
if !seen[code] {
|
|
seen[code] = true
|
|
codes = append(codes, code)
|
|
}
|
|
}
|
|
sort.Strings(codes)
|
|
|
|
var out []ProfileChange
|
|
for _, code := range codes {
|
|
before, hasBefore := curIndex[code]
|
|
after, hasAfter := nextIndex[code]
|
|
switch {
|
|
case !hasBefore:
|
|
out = append(out, ProfileChange{Code: code, Kind: ChangeAdded, After: &after})
|
|
case !hasAfter:
|
|
out = append(out, ProfileChange{Code: code, Kind: ChangeRemoved, Before: &before})
|
|
default:
|
|
if fields := profileDiffFields(before, after); len(fields) > 0 {
|
|
out = append(out, ProfileChange{Code: code, Kind: ChangeModified, Before: &before, After: &after, Fields: fields})
|
|
}
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func profileDiffFields(a, b Profile) []string {
|
|
var fields []string
|
|
if a.Name != b.Name {
|
|
fields = append(fields, "name")
|
|
}
|
|
if a.AwardRanks != b.AwardRanks {
|
|
fields = append(fields, "awardRanks")
|
|
}
|
|
if a.LastPlaceZero != b.LastPlaceZero {
|
|
fields = append(fields, "lastPlaceZero")
|
|
}
|
|
if a.TieMode != b.TieMode {
|
|
fields = append(fields, "tieMode")
|
|
}
|
|
if a.RecordBonusMode != b.RecordBonusMode {
|
|
fields = append(fields, "recordBonusMode")
|
|
}
|
|
if !rulesEqual(a.Rules, b.Rules) {
|
|
fields = append(fields, "rules")
|
|
}
|
|
return fields
|
|
}
|
|
|
|
func rulesEqual(a, b []Rule) bool {
|
|
if len(a) != len(b) {
|
|
return false
|
|
}
|
|
for i := range a {
|
|
if a[i] != b[i] {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
// resolveTargets 把规则包展开成「项目编码 → 目标通道」。
|
|
// 优先级:eventOverrides 显式给了 channels > 第一条命中的 channelTemplates。
|
|
// 「只排名不计分」的项目固定解析成 0 通道;没被规则包提到的计分项目不出现在结果里,表示「保持原样」。
|
|
func resolveTargets(cur *Snapshot, next *RulePack) (map[string][]Channel, []string, error) {
|
|
overrideByCode := make(map[string]EventOverride, len(next.EventOverrides))
|
|
for _, o := range next.EventOverrides {
|
|
overrideByCode[o.EventCode] = o
|
|
}
|
|
|
|
targets := make(map[string][]Channel)
|
|
for _, ev := range cur.Events {
|
|
// 只排名不计分的项目固定 0 通道(devdocs 02 §2.4):否则会继承模板通道,
|
|
// 把名次带进奖牌榜。override 显式写了 scored:false 时同样清空。
|
|
scored := ev.Scored
|
|
if ov, ok := overrideByCode[ev.Code]; ok && ov.Scored != nil {
|
|
scored = *ov.Scored
|
|
}
|
|
if !scored {
|
|
targets[ev.Code] = nil
|
|
continue
|
|
}
|
|
if ov, ok := overrideByCode[ev.Code]; ok && ov.Channels != nil {
|
|
targets[ev.Code] = append([]Channel(nil), (*ov.Channels)...)
|
|
continue
|
|
}
|
|
for _, t := range next.ChannelTemplates {
|
|
if matchEvent(t.Match, ev) {
|
|
targets[ev.Code] = append([]Channel(nil), t.Channels...)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var unknown []string
|
|
for _, o := range next.EventOverrides {
|
|
if _, ok := cur.EventByCode(o.EventCode); !ok {
|
|
unknown = append(unknown, o.EventCode)
|
|
}
|
|
}
|
|
sort.Strings(unknown)
|
|
return targets, unknown, nil
|
|
}
|
|
|
|
func diffChannels(cur *Snapshot, targets map[string][]Channel) []ChannelChange {
|
|
curByCode := make(map[string]EventInfo, len(cur.Events))
|
|
for _, ev := range cur.Events {
|
|
curByCode[ev.Code] = ev
|
|
}
|
|
|
|
codes := make([]string, 0, len(targets))
|
|
for code := range targets {
|
|
codes = append(codes, code)
|
|
}
|
|
sort.Strings(codes)
|
|
|
|
var out []ChannelChange
|
|
for _, code := range codes {
|
|
ev := curByCode[code]
|
|
before := ev.Channels
|
|
after := targets[code]
|
|
if channelsEqual(before, after) {
|
|
continue
|
|
}
|
|
kind := ChangeModified
|
|
switch {
|
|
case len(before) == 0:
|
|
kind = ChangeAdded
|
|
case len(after) == 0:
|
|
kind = ChangeRemoved
|
|
}
|
|
out = append(out, ChannelChange{
|
|
EventCode: code,
|
|
EventName: ev.Name,
|
|
Kind: kind,
|
|
Before: append([]Channel(nil), before...),
|
|
After: append([]Channel(nil), after...),
|
|
})
|
|
}
|
|
return out
|
|
}
|
|
|
|
// channelsEqual 逐字段比较目标通道与库中通道。
|
|
// Channel 含 *bool 字段,整体比较会退化成比较指针地址,这里按补齐缺省后的值比。
|
|
func channelsEqual(a, b []Channel) bool {
|
|
if len(a) != len(b) {
|
|
return false
|
|
}
|
|
for i := range a {
|
|
if a[i].Scope != b[i].Scope || a[i].Basis != b[i].Basis || a[i].Profile != b[i].Profile {
|
|
return false
|
|
}
|
|
if a[i].CountsToTeam() != b[i].CountsToTeam() {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
func diffSettings(cur, next *RulePack) []SettingChange {
|
|
curSettings := settingsFromPack(cur)
|
|
nextSettings := settingsFromPack(next)
|
|
|
|
var out []SettingChange
|
|
for _, key := range settingsKeys() {
|
|
before, after := curSettings[key], nextSettings[key]
|
|
if before != after {
|
|
out = append(out, SettingChange{Key: key, Before: before, After: after})
|
|
}
|
|
}
|
|
return out
|
|
}
|