Files
Scoreboard/server/internal/httpapi/handlers_results.go
T
AskaEth 782a38f82f feat: 大屏控制可看局域网设备并逐台切页 + 两种新导出(单页成绩 / 单位积分总明细)
## 大屏控制(用户:管理面板只能看到本机显示器,看不到局域网设备;也不能给某块屏单独切页)
- 服务端:`POST /api/display/command` 新增可选 `targets []string` —— 空 = 广播(公告语义不变),
  非空 = 只发给点名的实例并返回命中数;命中 0 个返回 404 +「目标大屏已离线,请刷新在线列表」
  (不落审计、公告也不落库)。`DisplaySender` 签名随之扩展,新增
  `Hub.SendCommandToInstances`(与按房间的 SendCommand 并存)。
- 服务端:WS `hello` 新增可选 `screen`,`realtime.Instance` 新增 `Screen`(不带 omitempty,
  局域网浏览器恒为空串),这样管理端能把「本机显示器」与「在线实例」精确对上。
- 管理端「大屏控制」:写死的「在线看板」占位换成真实列表(5 秒轮询、页面隐藏停表),
  列出实例 id / 在线离线 / 落后 / 屏号或「局域网浏览器」/ 当前页 / 来源 / 心跳;
  每行可单独切页;本机显示器卡片补「当前页」与逐屏切页;离线时控件置灰并说明原因。
  页面下拉改为共用大屏那份页名清单(管理端两处标签随之变为「个人积分奖牌榜」「分项成绩」)。

## 导出(用户:保留多页工作簿的同时,再要一种全平铺单页;积分榜明细也要能导出)
- 新增 `GET /api/export/all-flat.xlsx` → `赛事成绩总表(单页).xlsx`:一个工作簿一张表,
  列 = 大项/小项/组别/名次/号码/单位/运动员-队/成绩/积分/状态/备注;前三列取
  `EventSheet` 的结构化字段(不解析标题),后 8 列就是 `eventColumns` 本身(append 拼出,
  两处不可能漂移)。**既有「全部」(all.xlsx,多 sheet)一字未动。**
- 新增 `GET /api/export/teams.xlsx` → `单位积分总明细.xlsx`:一张带「单位」列的总表 +
  每个有明细行的单位一张分表;**无明细行的单位不出分表**(空表没信息量,且会把假删除的
  隐藏单位名字重新印进导出件);已隐藏但有流水的单位照常出表(它在榜单上)。
- 积分榜页:页头「导出总明细」、单位明细面板「导出该单位明细」;导出页新增「全部(单页)」。

测试:服务端 12 包全绿 / 347 个测试函数;前端 vue-tsc 通过、184 例全过;Console 18 文件。
docs/ 与 devdocs/ 同步(含新增 Q65–Q70 与两轮进度记录)。
2026-09-11 00:44:03 +08:00

277 lines
9.0 KiB
Go

package httpapi
import (
"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 {
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())
}