## 大屏控制(用户:管理面板只能看到本机显示器,看不到局域网设备;也不能给某块屏单独切页) - 服务端:`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 与两轮进度记录)。
222 lines
9.0 KiB
Go
222 lines
9.0 KiB
Go
package httpapi_test
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"git.yeij.top/AskaEth/Scoreboard/server/internal/httpapi"
|
|
"git.yeij.top/AskaEth/Scoreboard/server/internal/realtime"
|
|
)
|
|
|
|
// strictDisplaySender 与 main.go 的 displaySender 同口径:经实时层校验 action,未知 action 直接报错。
|
|
// matched 为 nil 时按「广播算命中一块屏、定向一条算命中一块」返回,便于断言正常路径;
|
|
// 需要模拟「目标已离线」时把它设成 0。
|
|
type strictDisplaySender struct {
|
|
sent []string
|
|
targets [][]string
|
|
matched *int
|
|
}
|
|
|
|
func (d *strictDisplaySender) SendDisplayCommand(action string, payload any, targets []string) (int, error) {
|
|
if _, err := realtime.NewDisplayCommand(action, payload); err != nil {
|
|
return 0, err
|
|
}
|
|
d.sent = append(d.sent, action)
|
|
d.targets = append(d.targets, targets)
|
|
if d.matched != nil {
|
|
return *d.matched, nil
|
|
}
|
|
if len(targets) == 0 {
|
|
return 1, nil
|
|
}
|
|
return len(targets), nil
|
|
}
|
|
|
|
// settingValue 读取 settings 表里的点号键。
|
|
func settingValue(t *testing.T, env *testEnv, key string) string {
|
|
t.Helper()
|
|
var v string
|
|
if err := env.ev.QueryRow(`SELECT value FROM settings WHERE key = ?`, key).Scan(&v); err != nil {
|
|
t.Fatalf("读取配置 %s: %v", key, err)
|
|
}
|
|
return v
|
|
}
|
|
|
|
// 个人榜的单位展示字段必须取全量单位表:停用但有积分的单位也要显示名称与简称。
|
|
func TestAthleteStandingsUsesFullTeamTable(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
ids := env.seed(t)
|
|
env.createUser("recorder", "recorder-pass", "recorder")
|
|
client, _ := env.client()
|
|
env.login(client, "recorder", "recorder-pass")
|
|
|
|
env.do(client, http.MethodPut, "/api/results/draft", map[string]any{
|
|
"eventId": ids.event,
|
|
"results": []map[string]any{
|
|
{"entryId": ids.entryA, "resultValue": 11.58, "unit": "s", "status": "ok"},
|
|
{"entryId": ids.entryB, "resultValue": 11.92, "unit": "s", "status": "ok"},
|
|
},
|
|
}, true)
|
|
if status, env2 := env.do(client, http.MethodPost, "/api/results/publish", map[string]any{
|
|
"eventId": ids.event,
|
|
}, true); status != http.StatusOK {
|
|
t.Fatalf("发布应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
env.exec(t, `UPDATE teams SET active = 0 WHERE id = ?`, ids.teamB)
|
|
|
|
_, env2 := env.do(client, http.MethodGet, "/api/standings/athletes", nil, false)
|
|
rows := decodeData[[]map[string]any](t, env2)
|
|
seen := map[int64]map[string]any{}
|
|
for _, row := range rows {
|
|
seen[int64(row["athleteId"].(float64))] = row
|
|
}
|
|
|
|
active := seen[ids.athleteA]
|
|
if active == nil || active["teamName"] != "第一分公司" || active["shortName"] != "一司" {
|
|
t.Fatalf("在职单位的个人行应带单位名与简称: %+v", active)
|
|
}
|
|
stopped := seen[ids.athB]
|
|
if stopped == nil {
|
|
t.Fatalf("停用单位的运动员仍应在个人榜上: %+v", rows)
|
|
}
|
|
if stopped["teamName"] != "第二分公司" || stopped["shortName"] != "二司" {
|
|
t.Fatalf("停用单位的个人行应补齐单位名与简称,得到 %+v", stopped)
|
|
}
|
|
}
|
|
|
|
// 个人榜的 logoPath 取「运动员所属单位」的 logo:姓名前显示的是单位标识,不是运动员头像。
|
|
func TestAthleteStandingsIncludesTeamLogo(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
ids := env.seed(t)
|
|
env.createUser("recorder", "recorder-pass", "recorder")
|
|
client, _ := env.client()
|
|
env.login(client, "recorder", "recorder-pass")
|
|
|
|
env.do(client, http.MethodPut, "/api/results/draft", map[string]any{
|
|
"eventId": ids.event,
|
|
"results": []map[string]any{
|
|
{"entryId": ids.entryA, "resultValue": 11.58, "unit": "s", "status": "ok"},
|
|
{"entryId": ids.entryB, "resultValue": 11.92, "unit": "s", "status": "ok"},
|
|
},
|
|
}, true)
|
|
if status, env2 := env.do(client, http.MethodPost, "/api/results/publish", map[string]any{
|
|
"eventId": ids.event,
|
|
}, true); status != http.StatusOK {
|
|
t.Fatalf("发布应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
env.exec(t, `UPDATE teams SET logo_path = ? WHERE id = ?`, "/uploads/teams/a.png", ids.teamA)
|
|
// 历史数据里 logo 可能是空串,同样按「无 logo」下发 null。
|
|
env.exec(t, `UPDATE teams SET logo_path = '' WHERE id = ?`, ids.teamB)
|
|
|
|
_, env2 := env.do(client, http.MethodGet, "/api/standings/athletes", nil, false)
|
|
rows := decodeData[[]map[string]any](t, env2)
|
|
seen := map[int64]map[string]any{}
|
|
for _, row := range rows {
|
|
seen[int64(row["athleteId"].(float64))] = row
|
|
}
|
|
|
|
withLogo := seen[ids.athleteA]
|
|
if withLogo == nil || withLogo["logoPath"] != "/uploads/teams/a.png" {
|
|
t.Fatalf("有 logo 的单位,个人行应带该单位的 logo: %+v", withLogo)
|
|
}
|
|
noLogo, ok := seen[ids.athB]["logoPath"]
|
|
if !ok || noLogo != nil {
|
|
t.Fatalf("无 logo 的单位,个人行 logoPath 应为 null,得到 %+v", seen[ids.athB])
|
|
}
|
|
}
|
|
|
|
// 公告必须落库:只转发的话全屏推送结束(seconds 秒)后底栏会回落到「暂无公告」,
|
|
// 新连上的大屏也拿不到当前公告。
|
|
func TestDisplayAnnouncePersistsAndClears(t *testing.T) {
|
|
sender := &strictDisplaySender{}
|
|
env := newTestEnvWith(t, func(o *httpapi.Options) { o.Display = sender })
|
|
env.createUser("admin", "admin-pass", "admin")
|
|
env.createUser("recorder", "recorder-pass", "recorder")
|
|
recorder, _ := env.client()
|
|
env.login(recorder, "recorder", "recorder-pass")
|
|
admin, _ := env.client()
|
|
env.login(admin, "admin", "admin-pass")
|
|
|
|
// 公告的推送权限在 recorder,配置接口是 admin-only,所以落库必须由指令这一侧完成。
|
|
announceLogs := changeLogCount(t, env, "settings", "upsert")
|
|
status, env2 := env.do(recorder, http.MethodPost, "/api/display/command", map[string]any{
|
|
"action": "announce",
|
|
"payload": map[string]any{"text": "决赛推迟到 15:00", "seconds": 30},
|
|
}, true)
|
|
if status != http.StatusOK || !env2.OK {
|
|
t.Fatalf("推送公告应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
if len(sender.sent) != 1 || sender.sent[0] != "announce" {
|
|
t.Fatalf("公告应照旧转发给大屏,得到 %v", sender.sent)
|
|
}
|
|
if got := settingValue(t, env, "display.announce_text"); got != "决赛推迟到 15:00" {
|
|
t.Fatalf("公告正文应落库,得到 %q", got)
|
|
}
|
|
if got := settingValue(t, env, "display.announce_seconds"); got != "30" {
|
|
t.Fatalf("全屏时长应落库,得到 %q", got)
|
|
}
|
|
// 已连接的大屏靠 settings 变更重拉快照,没有这条变更它们看不到公告变化。
|
|
if got := changeLogCount(t, env, "settings", "upsert"); got != announceLogs+1 {
|
|
t.Fatalf("公告落库应新增 1 条 settings 变更,得到 %d → %d", announceLogs, got)
|
|
}
|
|
|
|
_, env2 = env.do(admin, http.MethodGet, "/api/settings", nil, false)
|
|
display := decodeData[map[string]any](t, env2)["display"].(map[string]any)
|
|
if display["announce"] != "决赛推迟到 15:00" {
|
|
t.Fatalf("settings.display.announce 应带当前公告: %+v", display)
|
|
}
|
|
|
|
// payload 没带 seconds 时落默认 20。
|
|
env.do(recorder, http.MethodPost, "/api/display/command", map[string]any{
|
|
"action": "announce",
|
|
"payload": map[string]any{"text": "第二条公告"},
|
|
}, true)
|
|
if got := settingValue(t, env, "display.announce_seconds"); got != "20" {
|
|
t.Fatalf("payload 未带 seconds 时应落默认 20,得到 %q", got)
|
|
}
|
|
|
|
// 清空公告:正文清空,重连的大屏拿到 null。
|
|
status, env2 = env.do(recorder, http.MethodPost, "/api/display/command",
|
|
map[string]any{"action": "announce_clear"}, true)
|
|
if status != http.StatusOK || !env2.OK {
|
|
t.Fatalf("清空公告应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
if got := settingValue(t, env, "display.announce_text"); got != "" {
|
|
t.Fatalf("清空后公告正文应为空串,得到 %q", got)
|
|
}
|
|
_, env2 = env.do(admin, http.MethodGet, "/api/settings", nil, false)
|
|
display = decodeData[map[string]any](t, env2)["display"].(map[string]any)
|
|
if v, ok := display["announce"]; !ok || v != nil {
|
|
t.Fatalf("清空后 settings.display.announce 应为 null: %+v", display)
|
|
}
|
|
}
|
|
|
|
// 公告归档只对 announce 系列生效,其它指令不能碰 settings;公告时长在清空后保留。
|
|
func TestDisplayAnnounceLeavesOtherCommandsAlone(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
env.createUser("recorder", "recorder-pass", "recorder")
|
|
client, _ := env.client()
|
|
env.login(client, "recorder", "recorder-pass")
|
|
|
|
env.do(client, http.MethodPost, "/api/display/command", map[string]any{
|
|
"action": "announce",
|
|
"payload": map[string]any{"text": "公告一", "seconds": 45},
|
|
}, true)
|
|
if status, env2 := env.do(client, http.MethodPost, "/api/display/command", map[string]any{
|
|
"action": "lock", "payload": map[string]any{},
|
|
}, true); status != http.StatusOK {
|
|
t.Fatalf("锁屏指令应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
if got := settingValue(t, env, "display.announce_text"); got != "公告一" {
|
|
t.Fatalf("非公告指令不应改公告正文,得到 %q", got)
|
|
}
|
|
|
|
env.do(client, http.MethodPost, "/api/display/command", map[string]any{"action": "announce_clear"}, true)
|
|
if got := settingValue(t, env, "display.announce_seconds"); got != "45" {
|
|
t.Fatalf("清空公告应保留全屏时长,得到 %q", got)
|
|
}
|
|
if got := changeLogCount(t, env, "settings", "upsert"); got != 2 {
|
|
t.Fatalf("推送、清空各应写 1 条 settings 变更、锁屏不写,共 2 条,得到 %d", got)
|
|
}
|
|
}
|