先把「实机复测」能在这台 Linux 机器上验的全部自己验掉(真服务端 + 真 Chromium + 真样本),
六批全部通过,另挖出 16 条缺陷,逐条修完并复验:
导入
- 坏字节被静默替换成 U+FFFD 却报「组别不存在」→ 检测 RuneError 回 400 + 可操作中文文案
- UTF-16 无 BOM 误报「缺少列 event_code」→ 保守判据识别并正确解码
- CSV 语法错只有英文 → 中文提示,英文原文保留在 detail
- 表头缺列补「第 1 行应是表头」的指向
导出
- 名次列宽 8 → 11(放得下「3(并列)」,Excel 里不再硬裁)
- 运动员/队列宽 18 → 24(含奖牌明细的同一列)
- 聚合流水行补组别(仅单位在该小项只参加一个组别时回推;多组别宁可留空也不猜)
- docProps 作者从 excelize 默认的 xuri 改成中性名 + 真实导出时间
- Content-Disposition 补 ASCII 退化 filename(9 个下载端点,含此前没有测试的 project.zip)
错误分级与限流
- 未知大屏指令 500 → 400 VALIDATION_FAILED(传输层真失败仍走 5xx)
- 5xx 的 ERROR 日志补 role / ip(4xx 的 WARN 一直有)
- 写限流 30 → 120 次/分钟/用户(登录 5 次/分/IP 不动,性质不同)
- 赛事名含非法字符时导出给 400 + 可操作提示(原来永远 500「服务端异常」)
大屏与基础设施
- 实时赛况 2 栏成绩末位被裁(1:09.00 显示成 1:09.0)→ 成绩列按内容定宽 + nowrap;
字号不缩,让位给可省略号截断的运动员列。真 Chromium 实测 slack −45px → +6px、0 裁切、
scrollWidth 恒 1920(无横向滚动条);顺带修掉 1 栏长成绩同样被裁 8px 的问题
- logging 启动即预建两个日志目录(原来 interceptions/ 懒创建,现场会以为日志坏了)
- C→S 裸帧由静默忽略改为 WARN,并把「要套 {event,data} 外壳」写进日志
- 建单位/大项漏传 active 不再静默建成「停用」(新增 decodeJSONPresence 按键是否存在判意图)
文档
- README 单位 logo 措辞收窄到「大屏端」(管理端只负责上传配置)
- 导入规范补三类编码报错说明 + 现场另存结论 + 限流提示
- 部署指南补「导出前先看赛事名称」与「切换后怎么确认真的切过去了」
- devdocs 05/08/13 同步(含第三十五轮的完整记录与教训)
自检:服务端 13 包连跑两遍全绿;前端 257 例;vue-tsc + build 通过;Console 18 文件。
版本号 dev_0.1.4 → dev_0.1.5。
286 lines
9.6 KiB
Go
286 lines
9.6 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)
|
|
}
|
|
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))
|
|
})
|
|
}
|
|
|
|
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))
|
|
})
|
|
}
|
|
|
|
// ---------- 积分与排名 ----------
|
|
|
|
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))
|
|
}
|
|
|
|
// ---------- 大屏控制与运维 ----------
|
|
|
|
// cmdAnnounceClear 是清空当前公告的指令;实时层的协议清单(realtime.ValidDisplayAction)还没登记它,
|
|
// 因此转发前要先看实时层认不认,见 displayCommandHandler。
|
|
const cmdAnnounceClear = "announce_clear"
|
|
|
|
// 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
|
|
// 清空公告必须落库,即使实时层尚不认这个 action(转发会被 NewDisplayCommand 拒收),
|
|
// 否则「撤销公告」会整体失败;协议登记后这里的转发自动生效。
|
|
if s.display != nil && (in.Action != cmdAnnounceClear || realtime.ValidDisplayAction(in.Action)) {
|
|
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 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")
|
|
return s.listAuditLogs(r.Context(), page, size, entityType, userID)
|
|
}
|
|
|
|
func (s *server) backupHandler(w http.ResponseWriter, r *http.Request) (any, error) {
|
|
return s.backup(r.Context())
|
|
}
|