## ① 成绩「作废本条 / 重新录入」——手滑填错了怎么办
- 新增 `POST /api/results/{id}/reopen`:把已发布的那条退回草稿(state=draft、
status=ok、rank=NULL、note=原因)并重算推榜;口径与既有 `void` 完全一致
(回滚类动作,不受 `standings.live_on_publish` 约束)。
- 成绩录入页新增「操作」列:已发布行可「作废本条」,已作废行可「重新录入」,
两者都必填原因、确认后立即重算+推大屏。**验收用例**:作废→重录→改→重发,
名次/流水/榜单与「一开始就填对」逐字节一致。
## ② 破纪录的驳回 / 作废
- 迁移 `0021_record_breaks_note.sql`:`record_breaks` 加一列可空 `note`。
- 新增 `GET /api/record-breaks?state=`(recorder 起可读,guest 403)与
`POST /api/record-breaks/{id}/reject`(必填原因):已批准的登记被作废时
**撤回该笔加分、重算推榜、并把该级别当前纪录恢复为上一条**;`approve`
放开为可对 rejected 再次批准。
- 破纪录页新增「已批准的破纪录」卡片(作废入口);原先只存在浏览器内存里的
「拒绝」改为持久化(先登记再驳回,刷新不再复现)。
## ③ 历史纪录的写入路径(`records.source` 以前恒为「本届」)
- 新增 `POST /api/records`(source 只收 history)与 `DELETE /api/records/{id}`
(删当前纪录时恢复上一条)。纪录库卡片新增「新增历史纪录」与「删除」。
- 至此《使用手册》6.2 承诺的「来源(本届/历史)」这一列才真正有意义。
## ④ 仪表盘补齐承诺的卡片
今天的小项(按 scheduledAt 的本地时区当天 + 进度)、草稿待发布、待确认破纪录、
大屏在线数;数据源读不到显示 `—` 而不是 0。文档里「管理端在线数」服务端没有
接口,按实际改写成本机管理端连接状态。
## 旧版数据包兼容(主人特别交代,三处验证)
迁移只加**可空**列、不重建表、不动数据行;旧赛事包导入后由 `main.go` 的
`store.MigrateEvent` 在启动时补跑迁移。证据:`migration_0021_test.go`
(旧库升级 + 幂等 + 老行取 NULL)、`migration_legacy_test.go` 扩到 0021、
`legacy_pack_upgrade_test.go`(真实旧 event.db 走 main 同一条路径后装配 API,
驳回老登记 → 加分撤回、纪录回退、旧数据逐表一行不差),另有真二进制冒烟。
未迁移的库上不存在任何新列读取。
## 文档
升级说明新增 dev_0.3.0(含「旧包仍可导入、自动补跑迁移」);使用手册新增
§4.10 与 §6.1/§6.2 明细;常见问题新增 Q98/Q99/Q100;devdocs 04/05/07/13/02
同步(含新接口表与错误分级)。
自检:服务端 13 包 ×2 全绿(httpapi 新增 reopen/reject/records/旧包 四个用例文件)、
前端 vue-tsc + 604 例 ×2 + build、Console 19 文件 + 54 例。
374 lines
13 KiB
Go
374 lines
13 KiB
Go
package httpapi
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"git.yeij.top/AskaEth/Scoreboard/server/internal/domain"
|
|
"git.yeij.top/AskaEth/Scoreboard/server/internal/realtime"
|
|
)
|
|
|
|
// ---------- 成绩 ----------
|
|
|
|
func (s *server) listResultsHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
eventID, _ := int64Query(r, "eventId")
|
|
state := strings.TrimSpace(r.URL.Query().Get("state"))
|
|
if state != "" && state != string(domain.ResultStateDraft) && state != string(domain.ResultStatePublished) {
|
|
return nil, badRequest("state 只能是 draft/published", state)
|
|
}
|
|
page, size := pageQuery(r)
|
|
return s.listResultsPage(r.Context(), eventID, state, page, size)
|
|
}
|
|
|
|
func (s *server) saveDraftHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
var in saveDraftPayload
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
if in.EventID == 0 {
|
|
return nil, badRequest("eventId 必填", nil)
|
|
}
|
|
if len(in.Results) == 0 {
|
|
return nil, badRequest("results 不能为空", nil)
|
|
}
|
|
// 计分引擎不读 points_override,落库只会造成「设置成功但毫无效果」。
|
|
// 这里直接拒绝并指向正确做法(积分调整),不做静默丢弃。
|
|
for i, it := range in.Results {
|
|
if it.PointsOverride != nil {
|
|
return nil, badRequest("pointsOverride 已不再支持:该值不会被计分引擎读取,请改用「积分调整」为该单位/运动员加减分", i)
|
|
}
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
saved, err := s.upsertDraft(r.Context(), in.EventID, middlewareUserID(r), in.Results)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
s.audit(r.Context(), "result.draft.save", "event", in.EventID, nil, saved)
|
|
return saved, nil
|
|
})
|
|
}
|
|
|
|
func (s *server) publishHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
var in publishPayload
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.publishResults(r.Context(), in, middlewareUserID(r))
|
|
})
|
|
}
|
|
|
|
func (s *server) unpublishHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
var in publishPayload
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.unpublishResults(r.Context(), in, middlewareUserID(r))
|
|
})
|
|
}
|
|
|
|
// settleResultsHandler 是「立即结算」:延迟结算下的人工兜底,按当前已发布成绩结算一次。
|
|
func (s *server) settleResultsHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
var in publishPayload
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.settleResults(r.Context(), in, middlewareUserID(r))
|
|
})
|
|
}
|
|
|
|
// settlementStatusHandler 返回未结算的 (小项, 组别) 清单,供录入页提示与「立即结算」入口。
|
|
func (s *server) settlementStatusHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
eventID, _ := int64Query(r, "eventId")
|
|
if eventID == 0 {
|
|
return nil, badRequest("eventId 必填", nil)
|
|
}
|
|
categoryID, _ := int64Query(r, "categoryId")
|
|
return s.settlementStatus(r.Context(), eventID, categoryID)
|
|
}
|
|
|
|
func (s *server) voidResultHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
id, err := pathID(r, "id")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var in voidResultPayload
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.voidResult(r.Context(), id, in.Reason, middlewareUserID(r))
|
|
})
|
|
}
|
|
|
|
// reopenResultHandler 把一条成绩退回草稿,供录入员直接修改后重新发布本组。
|
|
func (s *server) reopenResultHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
id, err := pathID(r, "id")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var in reopenResultPayload
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.reopenResult(r.Context(), id, in.Reason, middlewareUserID(r))
|
|
})
|
|
}
|
|
|
|
// ---------- 积分与排名 ----------
|
|
|
|
func (s *server) standingsHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
return s.standingsSnapshot(r.Context(), s.ev)
|
|
}
|
|
|
|
func (s *server) athleteStandingsHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
in, err := s.loadStandingsInput(r.Context(), s.ev)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// 展示字段以全量单位表为准(含停用单位),否则停用单位的运动员会显示空白单位名。
|
|
teams, err := s.teamMap(r.Context())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
genders := make(map[int64]*string, len(in.Athletes))
|
|
for _, a := range in.Athletes {
|
|
if a.Gender != "" {
|
|
g := a.Gender
|
|
genders[a.ID] = &g
|
|
}
|
|
}
|
|
rows := domain.BuildAthleteStandings(in)
|
|
out := make([]athleteStandingDTO, 0, len(rows))
|
|
for _, row := range rows {
|
|
item := athleteStandingDTO{
|
|
Rank: row.Rank,
|
|
AthleteID: row.AthleteID,
|
|
AthleteName: row.Name,
|
|
Gender: genders[row.AthleteID],
|
|
TeamID: row.TeamID,
|
|
TeamCode: row.TeamCode,
|
|
TeamName: row.TeamName,
|
|
TotalPoints: row.Points,
|
|
Gold: row.Gold,
|
|
Silver: row.Silver,
|
|
Bronze: row.Bronze,
|
|
}
|
|
if t, ok := teams[row.TeamID]; ok {
|
|
item.TeamCode = t.Code
|
|
item.TeamName = t.Name
|
|
item.ShortName = t.ShortName
|
|
// 单位表里可能存的是空串,下发前统一收敛成 null,与总积分榜口径一致。
|
|
item.LogoPath = nilIfEmpty(strValue(t.LogoPath))
|
|
}
|
|
out = append(out, item)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (s *server) breakdownHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
id, err := pathID(r, "id")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return s.teamBreakdown(r.Context(), id)
|
|
}
|
|
|
|
// ---------- 人工调整 ----------
|
|
|
|
func (s *server) listAdjustmentsHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
teamID, _ := int64Query(r, "teamId")
|
|
page, size := pageQuery(r)
|
|
return s.listAdjustments(r.Context(), teamID, page, size)
|
|
}
|
|
|
|
func (s *server) createAdjustmentHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
var in adjustmentInput
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.createAdjustment(r.Context(), in, middlewareUserID(r))
|
|
})
|
|
}
|
|
|
|
func (s *server) voidAdjustmentHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
id, err := pathID(r, "id")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var in voidAdjustmentPayload
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.voidAdjustment(r.Context(), id, middlewareUserID(r), in.Reason)
|
|
})
|
|
}
|
|
|
|
// ---------- 纪录 ----------
|
|
|
|
func (s *server) listRecordsHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
eventID, _ := int64Query(r, "eventId")
|
|
return s.listRecords(r.Context(), eventID)
|
|
}
|
|
|
|
func (s *server) createRecordBreakHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
var in recordBreakInput
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
created, err := s.createRecordBreak(r.Context(), in, middlewareUserID(r))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
s.audit(r.Context(), "record_break.create", "record_break", created.ID, nil, created)
|
|
return created, nil
|
|
})
|
|
}
|
|
|
|
func (s *server) approveRecordBreakHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
id, err := pathID(r, "id")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return s.approveRecordBreak(r.Context(), id, middlewareUserID(r))
|
|
}
|
|
|
|
// listRecordBreaksHandler 列出破纪录登记(最新在前),可选按审核状态过滤。
|
|
// 状态拼错时明确报 400:静默回空列表会让现场以为「登记全没了」。
|
|
func (s *server) listRecordBreaksHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
state := strings.TrimSpace(r.URL.Query().Get("state"))
|
|
switch state {
|
|
case "", "pending", "approved", "rejected":
|
|
default:
|
|
return nil, badRequest("state 只能是 pending/approved/rejected", state)
|
|
}
|
|
return s.listRecordBreaks(r.Context(), state)
|
|
}
|
|
|
|
// rejectRecordBreakHandler 驳回 / 作废一条破纪录登记;理由必填并落到 note。
|
|
func (s *server) rejectRecordBreakHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
id, err := pathID(r, "id")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var in rejectRecordBreakPayload
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.rejectRecordBreak(r.Context(), id, middlewareUserID(r), in.Reason)
|
|
})
|
|
}
|
|
|
|
// createRecordHandler 手工登记一条历史纪录(纪录库的「新增」)。
|
|
func (s *server) createRecordHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
var in recordEntryInput
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, s.idempotent(w, r, in.RequestID, func() (any, error) {
|
|
return s.createRecordEntry(r.Context(), in, middlewareUserID(r))
|
|
})
|
|
}
|
|
|
|
// deleteRecordHandler 删除一条纪录(纪录库的「删除」)。
|
|
func (s *server) deleteRecordHandler(w http.ResponseWriter, r *http.Request) error {
|
|
id, err := pathID(r, "id")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return s.deleteRecordEntry(r.Context(), id, middlewareUserID(r))
|
|
}
|
|
|
|
// ---------- 大屏控制与运维 ----------
|
|
|
|
// announceFromPayload 从 announce 指令的 payload 里取公告正文与全屏时长;
|
|
// payload 由 JSON 解出,缺失的字段按零值处理,由落库侧补默认时长。
|
|
func announceFromPayload(payload any) (string, int) {
|
|
fields, ok := payload.(map[string]any)
|
|
if !ok {
|
|
return "", 0
|
|
}
|
|
text, _ := fields["text"].(string)
|
|
seconds, _ := fields["seconds"].(float64)
|
|
return text, int(seconds)
|
|
}
|
|
|
|
// displayCommandAudit 是 display.command 的审计载荷:指令内容原样保留(现场按 action 检索的
|
|
// 既有查询不受影响),另外记上定向目标与实际命中的实例数。
|
|
type displayCommandAudit struct {
|
|
displayCommandInput
|
|
Matched int `json:"matched"`
|
|
}
|
|
|
|
func (s *server) displayCommandHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
var in displayCommandInput
|
|
if err := decodeJSON(r, &in); err != nil {
|
|
return nil, err
|
|
}
|
|
if in.Action == "" {
|
|
return nil, badRequest("action 必填", nil)
|
|
}
|
|
matched := 0
|
|
// 没接实时层(s.display == nil)时不转发,但下面的公告落库照旧:公告能被后连上来的
|
|
// 大屏读到靠的是 settings + change_log,与这一次广播无关。
|
|
if s.display != nil {
|
|
n, err := s.display.SendDisplayCommand(in.Action, in.Payload, in.Targets)
|
|
if err != nil {
|
|
// 未知 action 是请求体入参不合法,按 400 报,现场才看得懂「改 action」而不是「服务端异常」。
|
|
// 生产路径上这个错由 realtime.NewDisplayCommand 返回(裸错误,没带哨兵),
|
|
// 所以除了 errors.Is 还要按协议清单判一次;两类失败不能混成同一个 5xx:
|
|
// 只有传输层真失败(写 socket 失败等)才走 internal。
|
|
if errors.Is(err, realtime.ErrUnknownAction) || !realtime.ValidDisplayAction(in.Action) {
|
|
return nil, badRequest(fmt.Sprintf("未知的大屏指令 %q", in.Action), in.Action)
|
|
}
|
|
return nil, internal(err)
|
|
}
|
|
matched = n
|
|
// 点了名却一块屏都没命中(已离线或 id 写错)时明确报错,别让现场以为指令发出去了。
|
|
if len(in.Targets) > 0 && n == 0 {
|
|
return nil, notFound("目标大屏已离线,请刷新在线列表")
|
|
}
|
|
}
|
|
// 公告要落库:只转发不落库的话,全屏推送结束(seconds 秒)后底栏会回落到「暂无公告」,
|
|
// 新连上的大屏也拿不到当前公告。清空公告走同一份持久值(写空串),
|
|
// 否则大屏重连后会把已经撤掉的公告再显示一遍。
|
|
actorID := middlewareUserID(r)
|
|
switch in.Action {
|
|
case realtime.CmdAnnounce:
|
|
text, seconds := announceFromPayload(in.Payload)
|
|
if err := s.saveAnnouncement(r.Context(), text, seconds, actorID); err != nil {
|
|
return nil, err
|
|
}
|
|
case realtime.CmdAnnounceClear:
|
|
if err := s.clearAnnouncement(r.Context(), actorID); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
// 审计沿用同一条 action:现场按 action=display.command 检索的既有查询不受影响,
|
|
// after 里带了这次的具体 action、公告正文、定向目标与命中数。
|
|
s.audit(r.Context(), "display.command", "display", 0, nil,
|
|
displayCommandAudit{displayCommandInput: in, Matched: matched})
|
|
return nil, nil
|
|
}
|
|
|
|
func (s *server) listAuditLogsHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
page, size := pageQuery(r)
|
|
entityType := strings.TrimSpace(r.URL.Query().Get("entityType"))
|
|
userID, _ := int64Query(r, "userId")
|
|
action := strings.TrimSpace(r.URL.Query().Get("action"))
|
|
return s.listAuditLogs(r.Context(), page, size, entityType, userID, action)
|
|
}
|
|
|
|
func (s *server) backupHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
return s.backup(r.Context())
|
|
}
|