From 4a2b2b7d84028ed9e591e51141239a25decd6cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Mon, 19 Oct 2026 19:01:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(qaops):=20=E5=A2=9E=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=A0=91=E5=8C=BA=E5=9F=9F=E7=BB=9F=E8=AE=A1=E4=B8=8E?= =?UTF-8?q?=E7=88=B6=E5=AD=90=E8=81=94=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 区域配置入口改为区域统计,五列表按当前通讯录整支人员去重;调岗依当前归属、零分母未知、最近真实提问时间和父行收起不重算。仅读治理正式总表,后台单并发/请求合并/60秒缓存,目录与配置版本隔离,客户端失败不伪零。 保留区域自定义目录与预览/双版本锁保存,父部门勾选联选全后代,取消子支清除祖先整支选择,避免隐式覆盖未选子级;允许删除无引用区域,已有引用不静默孤立。统计页与设置共享选择,统计支持累计与北京时间自然月;不新增迁移,不改DobotAI生产、代理、原问答、历史趋势或已有AI任务。 验证已执行:完整make verify退出0,705 Go/340前端通过、120项声明的可选集成跳过且必需0跳过;镜像全量隔离PG race退出0;新增去重/调岗/空分母、后台缓存/并发、HTTP授权/严格请求、真PG目录与配置失效、树选择/收起、五列与删除保护均先红后绿。旧导航测试按新名称更新后全量通过。上线前治理库备份与真实恢复72表/29张QA内容哈希一致,匹配独立主密钥受限备份。 当前尚待精确SHA CI、同镜像真实数据浏览器与正式读回,不把源码验证称为已上线。公司真实区域映射不在本轮擅改;只在隔离库验证保存。 --- CHANGELOG.md | 12 + api/openapi.yaml | 60 ++++ internal/httpapi/qa_department_statistics.go | 45 +++ .../httpapi/qa_department_statistics_test.go | 69 ++++ internal/httpapi/qa_master.go | 2 +- internal/httpapi/server.go | 1 + .../department_statistics_cache.go | 99 ++++++ .../department_statistics_cache_test.go | 71 ++++ .../department_statistics_integration_test.go | 100 ++++++ .../department_statistics_store.go | 107 ++++++ internal/qaopsmirror/store.go | 9 +- internal/qaopsorg/department_statistics.go | 90 +++++ .../qaopsorg/department_statistics_test.go | 40 +++ web/src/QADepartmentStatistics.test.tsx | 25 ++ web/src/QADepartmentStatistics.tsx | 307 ++++++++++++++++++ web/src/QAOperations.test.tsx | 2 +- web/src/QAOperations.tsx | 6 +- web/src/QARegions.test.tsx | 10 + web/src/QARegions.tsx | 43 ++- web/src/qaDepartmentStatistics.css | 174 ++++++++++ web/src/qaDepartmentStatistics.fixture.ts | 62 ++++ web/src/qaDepartmentStatistics.test.ts | 23 ++ web/src/qaDepartmentStatistics.ts | 191 +++++++++++ web/src/qaDepartmentTree.test.ts | 26 ++ web/src/qaRegionSelection.ts | 88 +++++ 25 files changed, 1642 insertions(+), 20 deletions(-) create mode 100644 internal/httpapi/qa_department_statistics.go create mode 100644 internal/httpapi/qa_department_statistics_test.go create mode 100644 internal/qaopsmirror/department_statistics_cache.go create mode 100644 internal/qaopsmirror/department_statistics_cache_test.go create mode 100644 internal/qaopsmirror/department_statistics_integration_test.go create mode 100644 internal/qaopsmirror/department_statistics_store.go create mode 100644 internal/qaopsorg/department_statistics.go create mode 100644 internal/qaopsorg/department_statistics_test.go create mode 100644 web/src/QADepartmentStatistics.test.tsx create mode 100644 web/src/QADepartmentStatistics.tsx create mode 100644 web/src/qaDepartmentStatistics.css create mode 100644 web/src/qaDepartmentStatistics.fixture.ts create mode 100644 web/src/qaDepartmentStatistics.test.ts create mode 100644 web/src/qaDepartmentStatistics.ts create mode 100644 web/src/qaDepartmentTree.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c46734..fdc45ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,18 @@ > `0.1.12`),由 `scripts/version.py` 从 git **算出来**;开发交付的独立说明写入本文件“开发快照”章节,并打 `snapshot/vX.Y.Z` 注释标签 ⇒ 每次开发交付均可追溯, > 但"发布版本"仍然只能由人定(CI 不会自动升版本、不会打 tag)。 +## 开发快照 snapshot/v0.1.38 - 2026-10-19 + +### Added + +- 区域统计新增可展开部门树:部门、访问人数、访问比例、访问次数、最近提问时间五列,访问人数附当前通讯录总人数;整支含自身和全部子部门,按稳定人员身份去重,调岗依当前归属,零分母显示“—”,收起不重算数字。 +- 统计仅读独立治理总表中的提问事件,支持累计与北京时间自然月;单并发后台聚合、请求合并和60秒缓存,目录或区域配置版本变化立即隔离旧缓存;加载/失败不伪装零数据,不占用代理转发链路。 + +### Changed + +- 原“区域配置”入口改为“区域统计”,区域设置保留自定义区域新增/改名、未使用区域删除、部门映射预览与双版本锁保存;勾选父部门联选全部后代,取消子支时解除祖先整支选中,防止未选部门被父级新规则误覆盖。 +- 统计与区域设置共享选择;搜索、按区域查看及展开收起只改变可见行,既有总表、原始问答、历史趋势、模型任务与生产数据不修改。 + ## 开发快照 snapshot/v0.1.37 - 2026-10-19 ### Added diff --git a/api/openapi.yaml b/api/openapi.yaml index 75844cd..8eae267 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -44,6 +44,66 @@ } ], "paths": { + "/api/v1/qa-ops/departments/statistics": { + "post": { + "operationId": "qaDepartmentStatistics", + "summary": "部门树访问统计,当前通讯录整支人员去重", + "description": "仅独立治理总表,不读取生产或更改原问答;后台单聚合并发,响应202或60秒缓存结果。当前目录和区域配置版本加入缓存键;父行包含自身及全部后代,人员按当前稳定身份去重,调岗归当前部门;零分母比例为null,最近提问时间来自真实事件。访问指已入总表的提问事件,不含未记录的网页浏览。管理员同源只读POST,操作头qa-department-statistics。", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "type": "object", + "additionalProperties": false, + "required": [ + "period" + ], + "properties": { + "period": { + "type": "string", + "enum": [ + "all", + "month" + ] + }, + "month": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}$" + } + } + } + } + } + }, + "responses": { + "200": { + "$ref": "#/components/responses/Envelope" + }, + "400": { + "$ref": "#/components/responses/BadRequest" + }, + "401": { + "description": "需要登录" + }, + "403": { + "description": "仅管理员同源读取" + }, + "409": { + "description": "质量输入指纹变化,拒绝混合数据" + }, + "500": { + "$ref": "#/components/responses/InternalError" + }, + "503": { + "description": "本地副本或一致性投影不可用,不返回伪零" + }, + "202": { + "description": "后台聚合中;同条件合并单次执行,请按Retry-After轮询,不返回虚构零数据" + } + } + } + }, "/api/v1/qa-ops/ai/settings": {"get": {"operationId": "getQAAISettings", "tags": ["QA operations"], "summary": "读取独立模型配置的安全状态,不返回密钥", "description": "管理员会话限定、固定治理租户、禁止共享缓存;不修改DobotAI源数据库。", "responses": {"200": {"description": "成功;返回实际持久化状态,不将进度100%当成全成功", "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "properties": {"data": {"$ref": "#/components/schemas/QAAISafeSettings"}}, "required": ["data"]}}}}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员;写操作要求同源与明确意图"}, "409": {"description": "版本、范围或操作收据冲突,未覆盖现有结论"}, "422": {"description": "供应商明确拒绝或结构不合格,不伪造结果"}, "500": {"$ref": "#/components/responses/InternalError"}, "503": {"description": "存储、密钥或执行配置不可用;不返回伪零"}}}, "post": {"operationId": "saveQAAISettings", "tags": ["QA operations"], "summary": "验证并加密保存独立模型配置;不启动历史或自动任务", "description": "管理员会话限定、固定治理租户、禁止共享缓存;不修改DobotAI源数据库。", "responses": {"200": {"description": "成功;返回实际持久化状态,不将进度100%当成全成功", "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "properties": {"data": {"$ref": "#/components/schemas/QAAISafeSettings"}}, "required": ["data"]}}}}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员;写操作要求同源与明确意图"}, "409": {"description": "版本、范围或操作收据冲突,未覆盖现有结论"}, "422": {"description": "供应商明确拒绝或结构不合格,不伪造结果"}, "500": {"$ref": "#/components/responses/InternalError"}, "503": {"description": "存储、密钥或执行配置不可用;不返回伪零"}}, "parameters": [{"name": "X-Governance-Action", "in": "header", "required": true, "schema": {"const": "qa-ai"}}], "requestBody": {"required": true, "content": {"application/json": {"schema": {"$ref": "#/components/schemas/QAAISaveSettings"}}}}}}, "/api/v1/qa-ops/ai/settings/test": {"post": {"operationId": "testQAAISettings", "tags": ["QA operations"], "summary": "发送最小非公司数据真实模型探测;不保存配置", "description": "管理员会话限定、固定治理租户、禁止共享缓存;不修改DobotAI源数据库。", "responses": {"200": {"description": "成功;返回实际持久化状态,不将进度100%当成全成功", "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "properties": {"data": {"$ref": "#/components/schemas/QAAISafeSettings"}}, "required": ["data"]}}}}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员;写操作要求同源与明确意图"}, "409": {"description": "版本、范围或操作收据冲突,未覆盖现有结论"}, "422": {"description": "供应商明确拒绝或结构不合格,不伪造结果"}, "500": {"$ref": "#/components/responses/InternalError"}, "503": {"description": "存储、密钥或执行配置不可用;不返回伪零"}}, "parameters": [{"name": "X-Governance-Action", "in": "header", "required": true, "schema": {"const": "qa-ai"}}], "requestBody": {"required": true, "content": {"application/json": {"schema": {"$ref": "#/components/schemas/QAAISaveSettings"}}}}}}, "/api/v1/qa-ops/ai/automation": {"post": {"operationId": "setQAAIAutomation", "tags": ["QA operations"], "summary": "按任务启停增量;首次排除历史,关闭停止新增与未开始任务", "description": "管理员会话限定、固定治理租户、禁止共享缓存;不修改DobotAI源数据库。", "responses": {"200": {"description": "成功;返回实际持久化状态,不将进度100%当成全成功", "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "properties": {"data": {"$ref": "#/components/schemas/QAAISafeSettings"}}, "required": ["data"]}}}}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员;写操作要求同源与明确意图"}, "409": {"description": "版本、范围或操作收据冲突,未覆盖现有结论"}, "422": {"description": "供应商明确拒绝或结构不合格,不伪造结果"}, "500": {"$ref": "#/components/responses/InternalError"}, "503": {"description": "存储、密钥或执行配置不可用;不返回伪零"}}, "parameters": [{"name": "X-Governance-Action", "in": "header", "required": true, "schema": {"const": "qa-ai"}}], "requestBody": {"required": true, "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "properties": {"kind": {"type": "string", "enum": ["evaluation", "translation"]}, "enabled": {"type": "boolean"}}, "required": ["kind", "enabled"]}}}}}}, diff --git a/internal/httpapi/qa_department_statistics.go b/internal/httpapi/qa_department_statistics.go new file mode 100644 index 0000000..7dd0a20 --- /dev/null +++ b/internal/httpapi/qa_department_statistics.go @@ -0,0 +1,45 @@ +package httpapi + +import ( + "context" + "knowledge-governance/internal/dobotaiops" + "knowledge-governance/internal/qaopsmirror" + "net/http" + "time" +) + +type departmentStatisticsReader interface { + ReadDepartmentStatistics(context.Context, qaopsmirror.DepartmentStatisticsQuery, time.Time) (qaopsmirror.DepartmentStatisticsResult, error) +} + +func qaDepartmentStatistics(w http.ResponseWriter, r *http.Request, c Config) { + if !authorizeQAOps(w, r) || !authorizeQAIntent(w, r, "qa-department-statistics") { + return + } + var q qaopsmirror.DepartmentStatisticsQuery + if r.URL.RawQuery != "" || decodeQualityJSON(w, r, &q, "period") != nil { + qaOpsError(w, dobotaiops.ErrInvalidQuery) + return + } + now := c.Now() + if _, _, e := q.Bounds(now); e != nil { + qaOpsError(w, e) + return + } + reader, ok := c.QAOps.(departmentStatisticsReader) + if !ok || c.QAOpsTenantKey == "" { + qaOpsError(w, dobotaiops.ErrUnavailable) + return + } + data, e := reader.ReadDepartmentStatistics(r.Context(), q, now) + if e != nil { + qaOpsError(w, e) + return + } + status := http.StatusOK + if data.State == "pending" { + status = http.StatusAccepted + w.Header().Set("Retry-After", "1") + } + writeJSON(w, status, map[string]any{"data": data}) +} diff --git a/internal/httpapi/qa_department_statistics_test.go b/internal/httpapi/qa_department_statistics_test.go new file mode 100644 index 0000000..6a7a794 --- /dev/null +++ b/internal/httpapi/qa_department_statistics_test.go @@ -0,0 +1,69 @@ +package httpapi + +import ( + "context" + "knowledge-governance/internal/qaopsmirror" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" +) + +type departmentStatisticsFixture struct { + masterFixtureReader + reads int +} + +func (f *departmentStatisticsFixture) ReadDepartmentStatistics(context.Context, qaopsmirror.DepartmentStatisticsQuery, time.Time) (qaopsmirror.DepartmentStatisticsResult, error) { + f.reads++ + return qaopsmirror.DepartmentStatisticsResult{State: "pending", RetryAfter: 1}, nil +} +func TestDepartmentStatisticsRouteIsAsynchronousStrictAndAdminOnly(t *testing.T) { + auth := newFakeAuthStore() + auth.sessions["dept-fixture-admin"] = "usr-boss" + auth.sessions["dept-fixture-viewer"] = "usr-eye" + reader := &departmentStatisticsFixture{} + h, e := NewHandler(Config{Store: &fakeJobStore{}, Auth: &AuthConfig{Store: auth}, QAOps: reader, QAOpsTenantKey: "fixture-tenant", Now: func() time.Time { return time.Date(2026, 10, 19, 0, 0, 0, 0, time.UTC) }}) + if e != nil { + t.Fatal(e) + } + for _, c := range []struct { + body, token, intent, site string + want int + }{ + {`{"period":"all"}`, "dept-fixture-admin", "qa-department-statistics", "", 202}, + {`{"period":"month","month":"2026-10"}`, "dept-fixture-admin", "qa-department-statistics", "same-origin", 202}, + {`{"period":"all"}`, "", "qa-department-statistics", "", 401}, + {`{"period":"all"}`, "dept-fixture-viewer", "qa-department-statistics", "", 403}, + {`{"period":"all"}`, "dept-fixture-admin", "", "", 403}, + {`{"period":"all"}`, "dept-fixture-admin", "qa-department-statistics", "cross-site", 403}, + {`{"period":"all","tenant":"other"}`, "dept-fixture-admin", "qa-department-statistics", "", 400}, + {`{"period":"all","period":"all"}`, "dept-fixture-admin", "qa-department-statistics", "", 400}, + {`null`, "dept-fixture-admin", "qa-department-statistics", "", 400}, + {`{"period":"month","month":"2027-01"}`, "dept-fixture-admin", "qa-department-statistics", "", 400}, + {`{"period":"all","month":"2026-10"}`, "dept-fixture-admin", "qa-department-statistics", "", 400}, + } { + r := httptest.NewRequest("POST", "/api/v1/qa-ops/departments/statistics", strings.NewReader(c.body)) + if c.token != "" { + r.AddCookie(&http.Cookie{Name: sessionCookieName, Value: c.token}) + } + if c.intent != "" { + r.Header.Set("X-Governance-Action", c.intent) + } + if c.site != "" { + r.Header.Set("Sec-Fetch-Site", c.site) + } + w := httptest.NewRecorder() + h.ServeHTTP(w, r) + if w.Code != c.want { + t.Fatalf("department statistics got %d want %d", w.Code, c.want) + } + if w.Header().Get("Cache-Control") != "no-store" { + t.Fatal("employee department stats became publicly cacheable") + } + } + if reader.reads != 2 { + t.Fatal("malformed or unauthorized request reached aggregation", reader.reads) + } +} diff --git a/internal/httpapi/qa_master.go b/internal/httpapi/qa_master.go index 471edb2..357b787 100644 --- a/internal/httpapi/qa_master.go +++ b/internal/httpapi/qa_master.go @@ -10,7 +10,7 @@ import ( func masterNoStore(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if strings.HasPrefix(r.URL.Path, "/api/v1/qa-ops/master/") { + if strings.HasPrefix(r.URL.Path, "/api/v1/qa-ops/master/") || strings.HasPrefix(r.URL.Path, "/api/v1/qa-ops/departments/") { w.Header().Set("Cache-Control", "no-store") w.Header().Set("Pragma", "no-cache") } diff --git a/internal/httpapi/server.go b/internal/httpapi/server.go index b50c909..af728fa 100644 --- a/internal/httpapi/server.go +++ b/internal/httpapi/server.go @@ -181,6 +181,7 @@ func NewHandler(config Config) (http.Handler, error) { } mux := http.NewServeMux() registerQAAIRoutes(mux, config) + mux.HandleFunc("POST /api/v1/qa-ops/departments/statistics", func(w http.ResponseWriter, r *http.Request) { qaDepartmentStatistics(w, r, config) }) mux.HandleFunc("POST /api/v1/qa-ops/dashboard", func(w http.ResponseWriter, r *http.Request) { qaOperationsDashboard(w, r, config) }) mux.HandleFunc("POST /api/v1/qa-ops/quality/query", func(w http.ResponseWriter, r *http.Request) { qaQualityQuery(w, r, config) }) mux.HandleFunc("POST /api/v1/qa-ops/records/{id}/reviews", func(w http.ResponseWriter, r *http.Request) { qaQualityReview(w, r, config) }) diff --git a/internal/qaopsmirror/department_statistics_cache.go b/internal/qaopsmirror/department_statistics_cache.go new file mode 100644 index 0000000..f7fc3f2 --- /dev/null +++ b/internal/qaopsmirror/department_statistics_cache.go @@ -0,0 +1,99 @@ +package qaopsmirror + +import ( + "context" + "knowledge-governance/internal/dobotaiops" + "knowledge-governance/internal/qaopsorg" + "sync" + "time" +) + +type DepartmentStatisticsQuery struct { + Period string `json:"period"` + Month string `json:"month,omitempty"` +} +type DepartmentStatisticsSnapshot struct { + Regions []qaopsorg.RegionDefinition `json:"regions"` + qaopsorg.DepartmentStatistics + Organization dobotaiops.OrganizationVersion `json:"organization"` + Period string `json:"period"` + Month string `json:"month"` + Start *time.Time `json:"start"` + End time.Time `json:"end"` + GeneratedAt time.Time `json:"generated_at"` + ExpiresAt time.Time `json:"expires_at"` +} +type DepartmentStatisticsResult struct { + CacheKey string `json:"cache_key"` + State string `json:"state"` + CacheHit bool `json:"cache_hit"` + RetryAfter int `json:"retry_after"` + Snapshot *DepartmentStatisticsSnapshot `json:"snapshot"` +} +type departmentStatisticsEntry struct { + snapshot *DepartmentStatisticsSnapshot + err error + done bool + expires time.Time +} +type departmentStatisticsCache struct { + mu sync.Mutex + entries map[string]*departmentStatisticsEntry + slots chan struct{} +} + +func (c *departmentStatisticsCache) get(key string, now time.Time, load func(context.Context) (DepartmentStatisticsSnapshot, error)) (DepartmentStatisticsResult, error) { + c.mu.Lock() + defer c.mu.Unlock() + if c.entries == nil { + c.entries = map[string]*departmentStatisticsEntry{} + c.slots = make(chan struct{}, 1) + } + if entry := c.entries[key]; entry != nil && (!entry.done || now.Before(entry.expires)) { + if entry.err != nil { + return DepartmentStatisticsResult{}, dobotaiops.ErrUnavailable + } + if entry.done { + return DepartmentStatisticsResult{State: "ready", CacheKey: key, CacheHit: true, Snapshot: entry.snapshot}, nil + } + return DepartmentStatisticsResult{State: "pending", CacheKey: key, RetryAfter: 1}, nil + } + for k, v := range c.entries { + if v.done && !now.Before(v.expires) { + delete(c.entries, k) + } + } + if len(c.entries) >= 32 { + return DepartmentStatisticsResult{}, dobotaiops.ErrUnavailable + } + entry := &departmentStatisticsEntry{} + c.entries[key] = entry + go func() { + started := time.Now() + ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second) + defer cancel() + var data DepartmentStatisticsSnapshot + var err error + select { + case c.slots <- struct{}{}: + data, err = load(ctx) + <-c.slots + case <-ctx.Done(): + err = ctx.Err() + } + finished := now.Add(time.Since(started)) + data.GeneratedAt = finished + data.ExpiresAt = finished.Add(time.Minute) + c.mu.Lock() + defer c.mu.Unlock() + entry.done = true + entry.err = err + entry.expires = data.ExpiresAt + if err != nil { + entry.expires = finished.Add(5 * time.Second) + } else { + entry.snapshot = &data + } + }() + return DepartmentStatisticsResult{State: "pending", CacheKey: key, RetryAfter: 1}, nil +} diff --git a/internal/qaopsmirror/department_statistics_cache_test.go b/internal/qaopsmirror/department_statistics_cache_test.go new file mode 100644 index 0000000..b18cdc1 --- /dev/null +++ b/internal/qaopsmirror/department_statistics_cache_test.go @@ -0,0 +1,71 @@ +package qaopsmirror + +import ( + "context" + "sync" + "sync/atomic" + "testing" + "time" +) + +func TestDepartmentStatisticsCacheIsBackgroundSingleFlightAndExpires(t *testing.T) { + cache := &departmentStatisticsCache{} + started := make(chan struct{}) + release := make(chan struct{}) + var calls atomic.Int64 + now := time.Now() + load := func(ctx context.Context) (DepartmentStatisticsSnapshot, error) { + if calls.Add(1) == 1 { + close(started) + } + select { + case <-release: + case <-ctx.Done(): + return DepartmentStatisticsSnapshot{}, ctx.Err() + } + return DepartmentStatisticsSnapshot{Period: "all"}, nil + } + begin := time.Now() + r, e := cache.get("tenant/directory-v1/revision-v1/all", now, load) + if e != nil || r.State != "pending" || time.Since(begin) > 100*time.Millisecond { + t.Fatal("first view performed/blocked aggregation instead of scheduling it", e, r.State) + } + select { + case <-started: + case <-time.After(time.Second): + t.Fatal("background aggregator did not run") + } + var wg sync.WaitGroup + for i := 0; i < 32; i++ { + wg.Add(1) + go func() { + defer wg.Done() + r, e := cache.get("tenant/directory-v1/revision-v1/all", now, load) + if e != nil || r.State != "pending" { + t.Error("concurrent read did not join background work") + } + }() + } + wg.Wait() + if calls.Load() != 1 { + t.Fatal("identical requests spawned duplicate aggregation") + } + close(release) + for deadline := time.Now().Add(time.Second); ; { + r, e = cache.get("tenant/directory-v1/revision-v1/all", now, load) + if r.State == "ready" { + break + } + if time.Now().After(deadline) { + t.Fatal("background result never published") + } + time.Sleep(time.Millisecond) + } + if e != nil || !r.CacheHit || r.Snapshot == nil || calls.Load() != 1 { + t.Fatal("result cache was not reused") + } + r, e = cache.get("tenant/directory-v1/revision-v1/all", now.Add(61*time.Second), load) + if e != nil || r.State != "pending" { + t.Fatal("expired result was served as fresh") + } +} diff --git a/internal/qaopsmirror/department_statistics_integration_test.go b/internal/qaopsmirror/department_statistics_integration_test.go new file mode 100644 index 0000000..999c66d --- /dev/null +++ b/internal/qaopsmirror/department_statistics_integration_test.go @@ -0,0 +1,100 @@ +package qaopsmirror + +import ( + "context" + "encoding/json" + "knowledge-governance/internal/qaopsorg" + "testing" + "time" +) + +func TestDepartmentStatisticsReadsMasterAndInvalidatesCurrentDirectory(t *testing.T) { + p := mirrorFixture(t) + s := NewStore(p, "fixture-department-statistics") + reader, ok := any(s).(interface { + ReadDepartmentStatistics(context.Context, DepartmentStatisticsQuery, time.Time) (DepartmentStatisticsResult, error) + }) + if !ok { + t.Fatal("master-backed asynchronous department statistics reader is missing") + } + ctx := context.Background() + org := qaopsorg.NewStore(p, s.tenant) + directory := qaopsorg.Directory{Departments: []qaopsorg.Department{{ID: "root", Name: "Fixture Root"}, {ID: "child", ParentID: "root", Name: "Fixture Child"}, {ID: "other", ParentID: "root", Name: "Fixture Other"}, {ID: "empty", ParentID: "root", Name: "Fixture Empty"}}, People: []qaopsorg.Person{{ID: "person", UnionID: "union-person", DepartmentIDs: []string{"root", "child"}}, {ID: "second", DepartmentIDs: []string{"other"}}}} + state, e := org.ReplaceDirectory(ctx, qaopsorg.Import{Source: "weekly_report_snapshot", SyncedAt: time.Now(), Complete: true, Directory: directory}) + if e != nil { + t.Fatal(e) + } + for i, identity := range []map[string]string{{"staff_id": "person"}, {"union_id": "union-person"}, {"staff_id": "second"}} { + id := []string{"one", "two", "three"}[i] + at := "2026-10-05T01:00:00+08:00" + wire := map[string]any{"id": id, "asked_at": at, "question": "Fixture question " + id, "answer": "Fixture nonbusiness answer", "status": "succeeded", "asker": "Fixture display", "trigger_person": "", "department": "Former department must not decide current attribution", "references": []any{}, "media": []any{}} + raw, _ := json.Marshal(wire) + actor, _ := json.Marshal(identity) + _, e = p.Exec(ctx, `INSERT INTO qa_ops_master_records(tenant_key,id,event_key,origin,asked_at,question,status,identity,quality_hash,payload)VALUES($1,$2,repeat('a',64),'dobotai_2_0',$3,'fixture','succeeded',$4,repeat('b',64),$5)`, s.tenant, id, at, string(actor), string(raw)) + if e != nil { + t.Fatal(e) + } + } + now := time.Now() + query := DepartmentStatisticsQuery{Period: "all"} + wait := func() DepartmentStatisticsResult { + t.Helper() + deadline := time.Now().Add(3 * time.Second) + for { + r, e := reader.ReadDepartmentStatistics(ctx, query, now) + if e != nil { + t.Fatal(e) + } + if r.State == "ready" { + return r + } + if time.Now().After(deadline) { + t.Fatal("statistics did not finish in the background") + } + time.Sleep(5 * time.Millisecond) + } + } + cctx, cancel := context.WithCancel(ctx) + first, e := reader.ReadDepartmentStatistics(cctx, query, now) + cancel() + if e != nil || first.State != "pending" { + t.Fatal("first request must enqueue background aggregation", e) + } + ready := wait() + if ready.Snapshot.TotalVisits != 3 || ready.Snapshot.TotalPeople != 2 || ready.Snapshot.Organization.DirectoryID != state.DirectoryID { + t.Fatal("statistics used mirror-only records or wrong roster") + } + rows := map[string]qaopsorg.DepartmentStatistic{} + for _, r := range ready.Snapshot.Rows { + rows[r.ID] = r + } + if rows["root"].Visitors != 2 || rows["root"].Visits != 3 || rows["child"].Visitors != 1 || rows["child"].Visits != 2 || rows["empty"].Ratio != nil { + t.Fatal("subtree/alias/empty-denominator contract lost") + } + again, e := reader.ReadDepartmentStatistics(ctx, query, now.Add(time.Second)) + if e != nil || !again.CacheHit || again.Snapshot.GeneratedAt != ready.Snapshot.GeneratedAt { + t.Fatal("same condition was recomputed within 60 seconds") + } + directory.People[0].DepartmentIDs = []string{"other"} + state, e = org.ReplaceDirectory(ctx, qaopsorg.Import{Source: "weekly_report_snapshot", SyncedAt: time.Now(), Complete: true, Directory: directory}) + if e != nil { + t.Fatal(e) + } + moved := wait() + if moved.CacheKey == ready.CacheKey || moved.Snapshot.Organization.DirectoryID != state.DirectoryID { + t.Fatal("directory changes did not invalidate cache") + } + for _, r := range moved.Snapshot.Rows { + if r.ID == "child" && (r.TotalPeople != 0 || r.Visitors != 0 || r.Ratio != nil) { + t.Fatal("transferred person remained in former department") + } + } + _, e = org.SaveRules(ctx, qaopsorg.SaveRequest{DirectoryID: state.DirectoryID, BaseRevision: state.RevisionID, Rules: []qaopsorg.Rule{{DepartmentID: "other", Region: "APAC"}}}, "fixture-admin") + if e != nil { + t.Fatal(e) + } + updated := wait() + if updated.CacheKey == moved.CacheKey { + t.Fatal("saved regional configuration was hidden behind stale cached results") + } +} diff --git a/internal/qaopsmirror/department_statistics_store.go b/internal/qaopsmirror/department_statistics_store.go new file mode 100644 index 0000000..7022b82 --- /dev/null +++ b/internal/qaopsmirror/department_statistics_store.go @@ -0,0 +1,107 @@ +package qaopsmirror + +import ( + "context" + "crypto/sha256" + "encoding/hex" + "encoding/json" + "github.com/jackc/pgx/v5" + "knowledge-governance/internal/dobotaiops" + "knowledge-governance/internal/qaopsorg" + "time" +) + +func (q DepartmentStatisticsQuery) Bounds(now time.Time) (*time.Time, time.Time, error) { + if q.Period == "all" && q.Month == "" { + return nil, now, nil + } + if q.Period != "month" { + return nil, time.Time{}, dobotaiops.ErrInvalidQuery + } + zone := time.FixedZone("Asia/Shanghai", 8*3600) + start, err := time.ParseInLocation("2006-01", q.Month, zone) + if err != nil || start.Year() < 2000 || start.After(now) { + return nil, time.Time{}, dobotaiops.ErrInvalidQuery + } + end := start.AddDate(0, 1, 0) + if end.After(now) { + end = now + } + return &start, end, nil +} +func (s *Store) ReadDepartmentStatistics(ctx context.Context, q DepartmentStatisticsQuery, now time.Time) (DepartmentStatisticsResult, error) { + if !s.valid() { + return DepartmentStatisticsResult{}, dobotaiops.ErrUnavailable + } + start, end, err := q.Bounds(now) + if err != nil { + return DepartmentStatisticsResult{}, err + } + var directory, revision string + err = s.pool.QueryRow(ctx, `SELECT directory_id,COALESCE(revision_id,'')FROM qa_ops_organization_state WHERE tenant_key=$1`, s.tenant).Scan(&directory, &revision) + if err != nil || directory == "" { + return DepartmentStatisticsResult{}, dobotaiops.ErrUnavailable + } + raw, _ := json.Marshal([]string{s.tenant, directory, revision, q.Period, q.Month}) + digest := sha256.Sum256(raw) + key := hex.EncodeToString(digest[:]) + return s.departmentStats.get(key, now, func(background context.Context) (DepartmentStatisticsSnapshot, error) { + return s.loadDepartmentStatistics(background, q, start, end, directory, revision) + }) +} +func (s *Store) loadDepartmentStatistics(ctx context.Context, q DepartmentStatisticsQuery, start *time.Time, end time.Time, directory, revision string) (DepartmentStatisticsSnapshot, error) { + out := DepartmentStatisticsSnapshot{Period: q.Period, Month: q.Month, Start: start, End: end} + tx, err := s.pool.BeginTx(ctx, pgx.TxOptions{IsoLevel: pgx.RepeatableRead, AccessMode: pgx.ReadOnly}) + if err != nil { + return out, dobotaiops.ErrUnavailable + } + defer tx.Rollback(context.Background()) + if _, err = tx.Exec(ctx, `SET LOCAL statement_timeout='15s'`); err != nil { + return out, dobotaiops.ErrUnavailable + } + p, err := qaopsorg.NewStore(s.pool, s.tenant).GetAttributionInTx(ctx, tx) + if err != nil || p.Metadata.State != "ready" || p.Metadata.DirectoryID != directory || p.Metadata.RevisionID != revision { + return out, dobotaiops.ErrUnavailable + } + out.Regions = p.Metadata.RegionDefinitions() + out.Organization = dobotaiops.OrganizationVersion{State: p.Metadata.State, DirectoryID: p.Metadata.DirectoryID, DirectorySource: p.Metadata.DirectorySource, SyncedAt: p.Metadata.DirectorySyncedAt, RevisionID: p.Metadata.RevisionID, Basis: "current_directory", RegionNames: p.Metadata.RegionLabels()} + rows, err := tx.Query(ctx, `SELECT identity::text,COALESCE(payload->>'asker',''),COALESCE(NULLIF(local_fields->>'trigger_person',''),payload->>'trigger_person',''),count(*),max(asked_at),min(asked_at) FROM qa_ops_master_records WHERE tenant_key=$1 AND($2::timestamptz IS NULL OR asked_at>=$2)AND asked_at<$3 GROUP BY identity,COALESCE(payload->>'asker',''),COALESCE(NULLIF(local_fields->>'trigger_person',''),payload->>'trigger_person','') LIMIT 100001`, s.tenant, start, end) + if err != nil { + return out, dobotaiops.ErrUnavailable + } + activity := []qaopsorg.DepartmentActivity{} + var earliest *time.Time + for rows.Next() { + var a qaopsorg.DepartmentActivity + var raw string + var identity dobotaiops.ActorIdentity + var first time.Time + if rows.Scan(&raw, &a.Asker, &a.Trigger, &a.Visits, &a.LastAskedAt, &first) != nil || json.Unmarshal([]byte(raw), &identity) != nil { + rows.Close() + return out, dobotaiops.ErrUnavailable + } + a.StaffID = identity.StaffID + a.UnionID = identity.UnionID + activity = append(activity, a) + if earliest == nil || first.Before(*earliest) { + at := first + earliest = &at + } + } + err = rows.Err() + rows.Close() + if err != nil || len(activity) > 100000 { + return out, dobotaiops.ErrUnavailable + } + out.DepartmentStatistics, err = qaopsorg.AggregateDepartmentStatistics(p, activity) + if err != nil { + return out, dobotaiops.ErrUnavailable + } + if q.Period == "all" { + out.Start = earliest + } + if tx.Commit(ctx) != nil { + return out, dobotaiops.ErrUnavailable + } + return out, nil +} diff --git a/internal/qaopsmirror/store.go b/internal/qaopsmirror/store.go index 5c04526..9dfd367 100644 --- a/internal/qaopsmirror/store.go +++ b/internal/qaopsmirror/store.go @@ -17,10 +17,11 @@ const Interval = 5 * time.Minute const localBaseSQL = `WITH records AS (SELECT id,asked_at,question,status,identity,quality_hash,payload FROM qa_ops_mirror_records WHERE tenant_key=$1)` type Store struct { - pool *pgxpool.Pool - tenant string - mu sync.RWMutex - safety dobotaiops.SourceSafety + pool *pgxpool.Pool + tenant string + mu sync.RWMutex + safety dobotaiops.SourceSafety + departmentStats departmentStatisticsCache } func NewStore(pool *pgxpool.Pool, tenant string) *Store { return &Store{pool: pool, tenant: tenant} } diff --git a/internal/qaopsorg/department_statistics.go b/internal/qaopsorg/department_statistics.go new file mode 100644 index 0000000..1c5b39e --- /dev/null +++ b/internal/qaopsorg/department_statistics.go @@ -0,0 +1,90 @@ +package qaopsorg + +import "time" + +type DepartmentActivity struct { + StaffID, UnionID, Asker, Trigger string + Visits int64 + LastAskedAt time.Time +} +type DepartmentStatistic struct { + ID string `json:"id"` + ParentID string `json:"parent_id"` + Name string `json:"name"` + Region string `json:"region"` + Visitors int `json:"visitors"` + TotalPeople int `json:"total_people"` + Ratio *float64 `json:"ratio"` + Visits int64 `json:"visits"` + LastAskedAt *time.Time `json:"last_asked_at"` +} +type DepartmentStatistics struct { + Rows []DepartmentStatistic `json:"rows"` + TotalVisits int64 `json:"total_visits"` + UnmappedVisits int64 `json:"unmapped_visits"` + TotalPeople int `json:"total_people"` +} + +func AggregateDepartmentStatistics(p *Attribution, activity []DepartmentActivity) (DepartmentStatistics, error) { + out := DepartmentStatistics{Rows: []DepartmentStatistic{}} + if p == nil || p.Metadata.State != "ready" { + return out, ErrUnavailable + } + indices := map[string]int{} + nodes := map[string]DepartmentView{} + visitors := map[string]map[string]bool{} + for _, d := range p.Metadata.View.Departments { + indices[d.ID] = len(out.Rows) + nodes[d.ID] = d + visitors[d.ID] = map[string]bool{} + out.Rows = append(out.Rows, DepartmentStatistic{ID: d.ID, ParentID: d.ParentID, Name: d.Name, Region: d.Region}) + } + branches := map[string][]string{} + for _, person := range p.Members() { + seen := map[string]bool{} + for _, id := range person.DepartmentIDs { + for id != "" && !seen[id] { + node, ok := nodes[id] + if !ok { + return out, ErrUnavailable + } + seen[id] = true + id = node.ParentID + } + } + for id := range seen { + out.Rows[indices[id]].TotalPeople++ + branches[person.PersonID] = append(branches[person.PersonID], id) + } + out.TotalPeople++ + } + for _, a := range activity { + if a.Visits <= 0 || a.LastAskedAt.IsZero() { + return out, ErrInvalid + } + out.TotalVisits += a.Visits + person := p.Resolve(a.StaffID, a.UnionID, a.Asker, a.Trigger) + if len(branches[person.PersonID]) == 0 { + out.UnmappedVisits += a.Visits + continue + } + for _, id := range branches[person.PersonID] { + row := &out.Rows[indices[id]] + visitors[id][person.PersonID] = true + row.Visits += a.Visits + if row.LastAskedAt == nil || a.LastAskedAt.After(*row.LastAskedAt) { + at := a.LastAskedAt + row.LastAskedAt = &at + } + } + } + for i := range out.Rows { + row := &out.Rows[i] + row.Visitors = len(visitors[row.ID]) + if row.TotalPeople > 0 { + percent := 100.0 * float64(row.Visitors) / float64(row.TotalPeople) + row.Ratio = &percent + } + } + return out, nil +} diff --git a/internal/qaopsorg/department_statistics_test.go b/internal/qaopsorg/department_statistics_test.go new file mode 100644 index 0000000..a09bb6c --- /dev/null +++ b/internal/qaopsorg/department_statistics_test.go @@ -0,0 +1,40 @@ +package qaopsorg + +import ( + "testing" + "time" +) + +func TestDepartmentStatisticsDeduplicateSubtreePeopleAndUseCurrentMembership(t *testing.T) { + directory := Directory{Departments: []Department{{ID: "root", Name: "Root"}, {ID: "child", ParentID: "root", Name: "Child"}, {ID: "former", ParentID: "root", Name: "Former"}, {ID: "current", ParentID: "root", Name: "Current"}, {ID: "empty", ParentID: "root", Name: "Empty"}}, People: []Person{{ID: "one", UnionID: "union-one", Name: "Fixture One", DepartmentIDs: []string{"root", "child"}}, {ID: "moved", Name: "Moved Fixture", DepartmentIDs: []string{"current"}}, {ID: "never", DepartmentIDs: []string{"child"}}}} + p, err := BuildAttribution(State{State: "ready", DirectoryID: "fixture"}, directory) + if err != nil { + t.Fatal(err) + } + earlier := time.Date(2026, 10, 1, 0, 0, 0, 0, time.UTC) + later := earlier.Add(time.Hour) + out, err := AggregateDepartmentStatistics(p, []DepartmentActivity{{StaffID: "one", Visits: 2, LastAskedAt: earlier}, {UnionID: "union-one", Visits: 1, LastAskedAt: later}, {Asker: "Moved Fixture", Visits: 4, LastAskedAt: earlier}, {StaffID: "not-in-current-directory", Visits: 5, LastAskedAt: later}}) + if err != nil { + t.Fatal("current-roster subtree aggregation is missing", err) + } + rows := map[string]DepartmentStatistic{} + for _, row := range out.Rows { + rows[row.ID] = row + } + root, child, current, former, empty := rows["root"], rows["child"], rows["current"], rows["former"], rows["empty"] + if root.TotalPeople != 3 || root.Visitors != 2 || root.Visits != 7 || root.Ratio == nil || *root.Ratio != 100.0*2/3 || root.LastAskedAt == nil || !root.LastAskedAt.Equal(later) { + t.Fatalf("subtree parent duplicated or event counts lost: %+v", root) + } + if child.TotalPeople != 2 || child.Visitors != 1 || child.Visits != 3 || child.Ratio == nil || *child.Ratio != 50 { + t.Fatalf("parent/child alias not deduplicated: %+v", child) + } + if current.Visitors != 1 || current.Visits != 4 || former.Visitors != 0 || former.Visits != 0 { + t.Fatal("historical events were attributed to an old department") + } + if empty.TotalPeople != 0 || empty.Ratio != nil || empty.LastAskedAt != nil { + t.Fatal("zero denominator fabricated a percentage/time") + } + if out.TotalVisits != 12 || out.UnmappedVisits != 5 || out.TotalPeople != 3 { + t.Fatalf("unmatched events hidden or fake membership: %+v", out) + } +} diff --git a/web/src/QADepartmentStatistics.test.tsx b/web/src/QADepartmentStatistics.test.tsx new file mode 100644 index 0000000..f72f70f --- /dev/null +++ b/web/src/QADepartmentStatistics.test.tsx @@ -0,0 +1,25 @@ +import { it, expect } from 'vitest' +import { renderToStaticMarkup } from 'react-dom/server' +import { DepartmentStatisticsView } from './QADepartmentStatistics' +import { parseDepartmentStatistics } from './qaDepartmentStatistics' +import { departmentStatisticsFixture } from './qaDepartmentStatistics.fixture' +it('renders exactly five requested columns, a denominator and no fabricated zero ratio', () => { + const data = parseDepartmentStatistics(departmentStatisticsFixture, { period: 'all' }).snapshot! + const html = renderToStaticMarkup() + const headers = [...html.matchAll(/]*>([^<]+)<\/th>/g)].map((m) => m[1]) + expect(headers).toEqual(['部门', '访问人数', '访问比例', '访问次数', '最近提问时间']) + expect(html).toContain('总人数') + expect(html).toContain('66.7%') + expect(html).toContain('50.0%') + expect(html).not.toContain('覆盖服务') + expect(html).toContain('data-ratio="unknown"') + expect(html).not.toContain('NaN') +}) +it('keeps parent values unchanged when child departments are collapsed', () => { + const data = parseDepartmentStatistics(departmentStatisticsFixture, { period: 'all' }).snapshot! + const html = renderToStaticMarkup() + expect(html).toContain('data-department-id="root"') + expect(html).not.toContain('data-department-id="child"') + expect(html).toContain('66.7%') + expect(html).toContain('总人数') +}) diff --git a/web/src/QADepartmentStatistics.tsx b/web/src/QADepartmentStatistics.tsx new file mode 100644 index 0000000..6b9599f --- /dev/null +++ b/web/src/QADepartmentStatistics.tsx @@ -0,0 +1,307 @@ +import { useEffect, useMemo, useRef, useState } from 'react' +import type { DepartmentStatisticsSnapshot } from './qaDepartmentStatistics' +import { fetchDepartmentStatistics } from './qaDepartmentStatistics' +import { departmentTree, selectDepartmentBranch, subtreeIDs } from './qaRegionSelection' +import { QARegions } from './QARegions' +import './qaDepartmentStatistics.css' +export interface DepartmentStatisticsViewProps { + data: DepartmentStatisticsSnapshot + selected?: string[] + collapsed?: ReadonlySet + search?: string + region?: string + onSelect?: (ids: string[]) => void + onCollapse?: (id: string) => void +} +export const departmentTime = (value: string) => + new Date(value).toLocaleString('zh-CN', { + timeZone: 'Asia/Shanghai', + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: '2-digit', + minute: '2-digit', + hour12: false, + }) +export function DepartmentStatisticsView(p: DepartmentStatisticsViewProps) { + const selected = p.selected ?? [], + collapsed = p.collapsed ?? new Set(), + rows = departmentTree(p.data.rows, collapsed, p.search ?? '', p.region ?? '') + return ( +
+
+ + + + + + + + + + + + + + + + + + + {rows.map(({ department: d, depth, hasChildren }) => { + const branch = subtreeIDs(p.data.rows, [d.id]), + checked = branch.every((id) => selected.includes(id)), + partial = !checked && branch.some((id) => selected.includes(id)), + label = p.data.regions.find((r) => r.id === d.region)?.name + return ( + + + + + + + + ) + })} + +
部门访问人数访问比例访问次数最近提问时间
+
+ { + if (node) node.indeterminate = partial + }} + onChange={(e) => + p.onSelect?.(selectDepartmentBranch(p.data.rows, selected, d.id, e.target.checked)) + } + /> + {hasChildren ? ( + + ) : ( + + )} + + {d.name} + {label ? {label} : null} + +
+
+ {d.visitors.toLocaleString('zh-CN')} + 总人数 {d.total_people.toLocaleString('zh-CN')} + + {d.ratio === null ? '—' : `${d.ratio.toFixed(1)}%`} + {d.visits.toLocaleString('zh-CN')}{d.last_asked_at === null ? '—' : departmentTime(d.last_asked_at)}
+ {!rows.length ?

没有匹配的部门

: null} +
+
+ ) +} +const currentMonth = () => { + const parts = new Intl.DateTimeFormat('zh-CN', { + timeZone: 'Asia/Shanghai', + year: 'numeric', + month: '2-digit', + }).formatToParts(new Date()) + return `${parts.find((p) => p.type === 'year')!.value}-${parts.find((p) => p.type === 'month')!.value}` +} +export function QARegionalStatistics() { + const [period, setPeriod] = useState<'all' | 'month'>('all'), + [month, setMonth] = useState(currentMonth), + [reload, setReload] = useState(0), + [settings, setSettings] = useState(false) + const [data, setData] = useState(null), + [error, setError] = useState(''), + [busy, setBusy] = useState(true), + [cached, setCached] = useState(false) + const [selected, setSelected] = useState([]), + [collapsed, setCollapsed] = useState>(new Set()), + [search, setSearch] = useState(''), + [region, setRegion] = useState('') + const key = useRef(''), + condition = useRef(''), + query = useMemo( + () => (period === 'all' ? { period: 'all' as const } : { period: 'month' as const, month }), + [period, month] + ) + useEffect(() => { + const controller = new AbortController() + let timer: ReturnType + const signature = JSON.stringify(query) + if (condition.current !== signature) { + setData(null) + key.current = '' + condition.current = signature + } + const poll = async () => { + setBusy(true) + setError('') + try { + const result = await fetchDepartmentStatistics(query, controller.signal) + if (controller.signal.aborted) return + if (key.current !== result.cache_key) { + setData(null) + key.current = result.cache_key + } + if (result.state === 'ready' && result.snapshot) { + const fresh = result.snapshot + setData(fresh) + setCached(result.cache_hit) + setBusy(false) + const ids = new Set(fresh.rows.map((d) => d.id)) + setSelected((old) => old.filter((id) => ids.has(id))) + setCollapsed((old) => new Set([...old].filter((id) => ids.has(id)))) + setRegion((old) => (fresh.regions.some((r) => r.id === old) ? old : '')) + timer = setTimeout(() => void poll(), Math.max(1000, Date.parse(fresh.expires_at) - Date.now() + 100)) + } else timer = setTimeout(() => void poll(), result.retry_after * 1000) + } catch (e) { + if (!controller.signal.aborted) { + setError(e instanceof Error ? e.message : '区域统计读取失败') + setBusy(false) + } + } + } + void poll() + return () => { + controller.abort() + clearTimeout(timer) + } + }, [query, reload]) + return ( +
+
+

区域统计

+
+ + +
+
+ + +
+ ) +} diff --git a/web/src/QAOperations.test.tsx b/web/src/QAOperations.test.tsx index 5019379..f7b32f7 100644 --- a/web/src/QAOperations.test.tsx +++ b/web/src/QAOperations.test.tsx @@ -117,7 +117,7 @@ describe('QA operations workbench', () => { it('uses the four requested destinations in their fixed order', () => { const html = renderToStaticMarkup() - const labels = ['问题流水', '问题统计看板', '区域配置', '周报生成'] + const labels = ['问题流水', '问题统计看板', '区域统计', '周报生成'] for (const label of labels) expect(html).toContain(label) for (let i = 1; i < labels.length; i++) expect(html.indexOf(labels[i - 1])).toBeLessThan(html.indexOf(labels[i])) expect(html).not.toContain('部门/区域保留源快照') diff --git a/web/src/QAOperations.tsx b/web/src/QAOperations.tsx index f71b41e..b3c3f89 100644 --- a/web/src/QAOperations.tsx +++ b/web/src/QAOperations.tsx @@ -4,7 +4,7 @@ import { useOptionalAuth } from './auth' import { fetchQARecord, fetchAllQARecords, fetchQAStatus, qaCellValue, qaColumns } from './qaOps' import type { QAQuery, QARecord, QARecordPage, QAStatus } from './qaOps' import './qaOps.css' -import { QARegions } from './QARegions' +import { QARegionalStatistics } from './QADepartmentStatistics' import { QADashboard } from './QADashboard' import { QAWeekly } from './QAWeekly' import { QAQualityEditor } from './QAQuality' @@ -26,7 +26,7 @@ export function QAOperationsTabs({ view, onChange }: { view: QAOpsView; onChange [ ['records', '问题流水'], ['dashboard', '问题统计看板'], - ['regions', '区域配置'], + ['regions', '区域统计'], ['weekly', '周报生成'], ] as const ).map(([id, label]) => ( @@ -603,7 +603,7 @@ export function QAOperations() { ) : null} {view === 'regions' ? ( - + ) : view === 'weekly' ? ( ) : view === 'dashboard' ? ( diff --git a/web/src/QARegions.test.tsx b/web/src/QARegions.test.tsx index ef893d2..0239af3 100644 --- a/web/src/QARegions.test.tsx +++ b/web/src/QARegions.test.tsx @@ -51,6 +51,16 @@ const props = { onRemoveMissing: vi.fn(), } describe('region mapping workbench', () => { + it('allows removing unused region definitions but protects regions referenced by department rules', () => { + const regions = [ + { id: 'APAC', name: 'Assigned' }, + { id: 'spare', name: 'Spare' }, + ] + const html = renderToStaticMarkup() + expect(html).toContain('删除区域 Spare') + expect(html).toMatch(/aria-label="删除区域 Assigned"[^>]*disabled=""/) + }) + it('separates multiselect from bulk application and renders hierarchy and editable region names', () => { const custom = { ...state, diff --git a/web/src/QARegions.tsx b/web/src/QARegions.tsx index fa7998a..e2b52a3 100644 --- a/web/src/QARegions.tsx +++ b/web/src/QARegions.tsx @@ -9,7 +9,7 @@ import { } from './qaOrg' import type { Organization, RegionRule, RegionDefinition } from './qaOrg' import './qaRegions.css' -import { applyBulkRegionRules, departmentLevels } from './qaRegionSelection' +import { applyBulkRegionRules, departmentLevels, selectDepartmentBranch } from './qaRegionSelection' import { completedSyncAction, directorySyncActive, fetchDirectorySync, startDirectorySync } from './qaOrgSync' import type { DirectorySyncStatus } from './qaOrgSync' import { newOperationID } from './operationKey' @@ -57,8 +57,7 @@ export function RegionMappingView(p: Props) { ) const maximum = rows.reduce((n, r) => Math.max(n, r.levels.length), 0) const label = (id: string, catalog = regions) => catalog.find((r) => r.id === id)?.name ?? id - const choose = (id: string, checked: boolean) => - p.onSelect?.(checked ? [...new Set([...selected, id])] : selected.filter((x) => x !== id)) + const choose = (id: string, checked: boolean) => p.onSelect?.(selectDepartmentBranch(all, selected, id, checked)) const add = () => { if (!newName.trim()) return const next = [...regions, { id: 'region-' + newOperationID(), name: newName.trim() }] @@ -155,6 +154,19 @@ export function RegionMappingView(p: Props) { p.onCatalog?.(regions.map((x) => (x.id === r.id ? { ...x, name: e.target.value } : x))) } /> + ))} @@ -226,12 +238,10 @@ export function RegionMappingView(p: Props) { disabled={p.busy || !departments.length} checked={departments.length > 0 && departments.every((r) => selected.includes(r.department.id))} onChange={(e) => { - const visible = new Set(departments.map((r) => r.department.id)) - p.onSelect?.( - e.target.checked - ? [...new Set([...selected, ...visible])] - : selected.filter((id) => !visible.has(id)) - ) + let next = [...selected] + for (const row of departments) + next = selectDepartmentBranch(all, next, row.department.id, e.target.checked) + p.onSelect?.(next) }} /> 全选当前列表 @@ -351,7 +361,11 @@ export function RegionMappingView(p: Props) { function signature(rules: RegionRule[], regions: RegionDefinition[]) { return JSON.stringify({ rules: [...rules].sort((a, b) => a.department_id.localeCompare(b.department_id)), regions }) } -export function QARegions() { +export function QARegions({ + selection, + onSelectionChange, + onSaved, +}: { selection?: string[]; onSelectionChange?: (ids: string[]) => void; onSaved?: () => void } = {}) { const [syncStatus, setSyncStatus] = useState(null), [syncError, setSyncError] = useState(''), [syncSubmitting, setSyncSubmitting] = useState(false) @@ -364,7 +378,12 @@ export function QARegions() { [preview, setPreview] = useState(null), [rules, setRules] = useState([]) const [regions, setRegions] = useState([]), - [selected, setSelected] = useState([]) + [localSelected, setLocalSelected] = useState([]) + const selected = selection ?? localSelected, + setSelected = (ids: string[]) => { + setLocalSelected(ids) + onSelectionChange?.(ids) + } const [region, setRegion] = useState(''), [search, setSearch] = useState(''), [busy, setBusy] = useState(false), @@ -496,6 +515,7 @@ export function QARegions() { accept(readback) if (readback.revision_id !== value.revision_id) throw new Error('保存后配置再次变化,已读取最新版本,请核对') setNotice('区域归属已保存并重新读取') + onSaved?.() } else setPreview(value) } } catch (e) { @@ -513,6 +533,7 @@ export function QARegions() { selectedIDs={selected} onCatalog={(next) => { setRegions(next) + setRegion((old) => (next.some((r) => r.id === old) ? old : (next[0]?.id ?? ''))) setPreview(null) setNotice('') setError('') diff --git a/web/src/qaDepartmentStatistics.css b/web/src/qaDepartmentStatistics.css new file mode 100644 index 0000000..96442c0 --- /dev/null +++ b/web/src/qaDepartmentStatistics.css @@ -0,0 +1,174 @@ +.qa-regional-statistics { + min-width: 0; + color: #334155; +} +.qa-department-toolbar { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + margin: 0 0 14px; +} +.qa-department-toolbar h3 { + margin: 0; + font-size: 18px; +} +.qa-department-actions, +.qa-department-filters { + display: flex; + align-items: end; + flex-wrap: wrap; + gap: 10px; +} +.qa-department-filters { + padding: 10px 0; +} +.qa-department-filters label { + display: flex; + flex-direction: column; + gap: 4px; + font-size: 12px; + color: #64748b; +} +.qa-department-filters input, +.qa-department-filters select { + min-height: 34px; + max-width: 240px; +} +.qa-department-meta, +.qa-department-note { + font-size: 12px; + color: #718096; + margin: 8px 0; + line-height: 1.6; +} +.qa-department-table-scroll { + max-height: calc(100vh - 340px); + min-height: 280px; + overflow: auto; + border: 1px solid #e5ebf2; + border-radius: 5px; + min-width: 0; + max-width: 100%; + background: #fff; +} +.qa-department-table { + width: 100%; + min-width: 900px; + border-collapse: collapse; + table-layout: fixed; + font-size: 14px; +} +.qa-department-name-column { + width: 43%; +} +.qa-department-time-column { + width: 20%; +} +.qa-department-table th, +.qa-department-table td { + padding: 13px 12px; + border-right: 1px solid #e8edf4; + border-bottom: 1px solid #e8edf4; + text-align: center; + vertical-align: middle; + white-space: nowrap; + font-variant-numeric: tabular-nums; +} +.qa-department-table th { + position: sticky; + top: 0; + z-index: 2; + background: #f8fafc; + font-weight: 600; + color: #60748c; +} +.qa-department-table td:first-child, +.qa-department-table th:first-child { + text-align: left; +} +.qa-department-table tbody tr:hover { + background: #f7faff; +} +.qa-department-name { + display: flex; + align-items: center; + gap: 7px; + min-width: 0; +} +.qa-department-name input[type='checkbox'] { + flex: none; + width: 15px; + height: 15px; + margin: 0; +} +.qa-department-expand, +.qa-department-expand-space { + display: inline-flex; + flex: none; + align-items: center; + justify-content: center; + width: 20px; + min-width: 20px; + height: 24px; +} +.qa-department-expand { + padding: 0; + border: 0; + background: transparent; + color: #536c88; + font-size: 20px; + cursor: pointer; +} +.qa-department-expand:focus-visible { + outline: 2px solid #3b82f6; + outline-offset: 2px; +} +.qa-department-label { + min-width: 0; + white-space: normal; + overflow-wrap: anywhere; + line-height: 1.5; +} +.qa-department-region, +.qa-department-roster { + display: block; + font-size: 11px; + line-height: 1.5; + color: #8190a4; + margin-top: 2px; +} +.qa-department-ratio { + font-weight: 650; +} +.qa-department-ratio[data-ratio='unknown'] { + font-weight: 400; + color: #8190a4; +} +.qa-department-editor { + min-width: 0; +} +@media (max-width: 680px) { + .qa-department-toolbar { + align-items: flex-start; + } + .qa-department-actions { + justify-content: flex-end; + } + .qa-department-actions button { + font-size: 12px; + padding: 6px 8px; + } + .qa-department-table-scroll { + max-height: 65vh; + } + .qa-department-filters input { + max-width: 180px; + } + .qa-department-filters { + gap: 8px; + } + .qa-department-filters label { + max-width: 100%; + } +} diff --git a/web/src/qaDepartmentStatistics.fixture.ts b/web/src/qaDepartmentStatistics.fixture.ts new file mode 100644 index 0000000..7e5bc5f --- /dev/null +++ b/web/src/qaDepartmentStatistics.fixture.ts @@ -0,0 +1,62 @@ +export const departmentStatisticsFixture = { + state: 'ready', + cache_key: 'a'.repeat(64), + cache_hit: true, + retry_after: 0, + snapshot: { + period: 'all', + month: '', + start: '2026-04-01T00:00:00+08:00', + end: '2026-10-19T12:00:00+08:00', + generated_at: '2026-10-19T12:00:01+08:00', + expires_at: '2026-10-19T12:01:01+08:00', + total_people: 3, + total_visits: 6, + unmapped_visits: 1, + organization: { + state: 'ready', + directory_id: 'fixture-directory', + directory_source: 'weekly_report_snapshot', + synced_at: '2026-10-18T00:00:00+08:00', + revision_id: 'fixture-revision', + basis: 'current_directory', + region_names: ['Education'], + }, + regions: [{ id: 'edu', name: 'Education' }], + rows: [ + { + id: 'root', + parent_id: '', + name: 'Fixture Root', + region: '', + visitors: 2, + total_people: 3, + ratio: (100 * 2) / 3, + visits: 5, + last_asked_at: '2026-10-18T06:00:00+08:00', + }, + { + id: 'child', + parent_id: 'root', + name: 'Fixture Child', + region: 'edu', + visitors: 1, + total_people: 2, + ratio: 50, + visits: 2, + last_asked_at: '2026-10-17T06:00:00+08:00', + }, + { + id: 'empty', + parent_id: 'root', + name: 'Empty', + region: '', + visitors: 0, + total_people: 0, + ratio: null, + visits: 0, + last_asked_at: null, + }, + ], + }, +} diff --git a/web/src/qaDepartmentStatistics.test.ts b/web/src/qaDepartmentStatistics.test.ts new file mode 100644 index 0000000..d58e64f --- /dev/null +++ b/web/src/qaDepartmentStatistics.test.ts @@ -0,0 +1,23 @@ +import { it, expect } from 'vitest' +import { parseDepartmentStatistics } from './qaDepartmentStatistics' +import { departmentStatisticsFixture as fixture } from './qaDepartmentStatistics.fixture' +it('preserves source roster denominators, null zero-denominator ratio and exact cache identity', () => { + const data = parseDepartmentStatistics(fixture, { period: 'all' }) + expect(data.snapshot?.rows[0].visitors).toBe(2) + expect(data.snapshot?.rows[0].total_people).toBe(3) + expect(data.snapshot?.rows[2].ratio).toBeNull() + expect(data.cache_key).toBe(fixture.cache_key) +}) +it('rejects fake zeros, invalid hierarchy, inconsistent ratios and wrong conditions', () => { + for (const rows of [ + fixture.snapshot.rows.map((r) => (r.id === 'empty' ? { ...r, ratio: 0 } : r)), + fixture.snapshot.rows.map((r) => (r.id === 'child' ? { ...r, parent_id: 'missing' } : r)), + fixture.snapshot.rows.map((r) => (r.id === 'child' ? { ...r, visitors: 3 } : r)), + fixture.snapshot.rows.map((r) => (r.id === 'child' ? { ...r, ratio: 70 } : r)), + fixture.snapshot.rows.map((r) => (r.id === 'child' ? { ...r, last_asked_at: '2027-01-01T00:00:00Z' } : r)), + ]) + expect(() => + parseDepartmentStatistics({ ...fixture, snapshot: { ...fixture.snapshot, rows } }, { period: 'all' }) + ).toThrow() + expect(() => parseDepartmentStatistics(fixture, { period: 'month', month: '2026-10' })).toThrow() +}) diff --git a/web/src/qaDepartmentStatistics.ts b/web/src/qaDepartmentStatistics.ts new file mode 100644 index 0000000..66fabd1 --- /dev/null +++ b/web/src/qaDepartmentStatistics.ts @@ -0,0 +1,191 @@ +import type { QAOrganizationVersion } from './qaOps' +import { parseQAOrganizationVersion } from './qaOps' +import { parseRegionDefinitions } from './qaOrg' +import { departmentTree } from './qaRegionSelection' +import type { RegionDefinition } from './qaOrg' +export interface DepartmentStatisticsQuery { + period: 'all' | 'month' + month?: string +} +export interface DepartmentStatistic { + id: string + parent_id: string + name: string + region: string + visitors: number + total_people: number + ratio: number | null + visits: number + last_asked_at: string | null +} +export interface DepartmentStatisticsSnapshot { + rows: DepartmentStatistic[] + total_visits: number + unmapped_visits: number + total_people: number + organization: QAOrganizationVersion + regions: RegionDefinition[] + period: 'all' | 'month' + month: string + start: string | null + end: string + generated_at: string + expires_at: string +} +export interface DepartmentStatisticsResult { + state: 'pending' | 'ready' + cache_key: string + cache_hit: boolean + retry_after: number + snapshot: DepartmentStatisticsSnapshot | null +} +const bad = (): never => { + throw Error('区域统计响应无效,请重试或联系管理员') +} +const obj = (v: unknown): Record => + v !== null && typeof v === 'object' && !Array.isArray(v) ? (v as Record) : bad() +const text = (v: unknown) => (typeof v === 'string' ? v : bad()) +const count = (v: unknown) => (typeof v === 'number' && Number.isSafeInteger(v) && v >= 0 ? v : bad()) +const instant = (v: unknown) => (typeof v === 'string' && Number.isFinite(Date.parse(v)) ? v : bad()) +export function parseDepartmentStatistics(raw: unknown, query: DepartmentStatisticsQuery): DepartmentStatisticsResult { + const v = obj(raw), + cache_key = text(v.cache_key) + if ( + !/^[a-f0-9]{64}$/.test(cache_key) || + typeof v.cache_hit !== 'boolean' || + !['pending', 'ready'].includes(String(v.state)) + ) + return bad() + if (v.state === 'pending') { + if (v.snapshot !== null || v.retry_after !== 1) return bad() + return { state: 'pending', cache_key, cache_hit: false, retry_after: 1, snapshot: null } + } + if (v.retry_after !== 0) return bad() + const d = obj(v.snapshot), + organization = parseQAOrganizationVersion(d.organization) + if (!organization || organization.state !== 'ready' || !organization.directory_id || !organization.synced_at) + return bad() + const regions = parseRegionDefinitions(d.regions), + regionIDs = new Set(regions.map((r) => r.id)) + if ( + d.period !== query.period || + d.month !== (query.month ?? '') || + !Array.isArray(d.rows) || + !d.rows.length || + d.rows.length > 20000 + ) + return bad() + const end = instant(d.end), + generated = instant(d.generated_at), + expires = instant(d.expires_at), + start = d.start === null ? null : instant(d.start) + if ( + Date.parse(expires) - Date.parse(generated) !== 60000 || + Date.parse(end) > Date.parse(generated) || + (start !== null && Date.parse(start) >= Date.parse(end)) + ) + return bad() + const total_people = count(d.total_people), + total_visits = count(d.total_visits), + unmapped_visits = count(d.unmapped_visits) + if (unmapped_visits > total_visits) return bad() + const rows: DepartmentStatistic[] = d.rows.map((raw) => { + const r = obj(raw), + id = text(r.id), + parent_id = text(r.parent_id), + name = text(r.name), + region = text(r.region), + visitors = count(r.visitors), + total = count(r.total_people), + visits = count(r.visits), + last = r.last_asked_at === null ? null : instant(r.last_asked_at) + if ( + !id || + !name || + (region !== '' && !regionIDs.has(region)) || + visitors > total || + total > total_people || + visits < visitors || + visits > total_visits - unmapped_visits || + (visits === 0) !== (visitors === 0) || + (visits === 0) !== (last === null) || + (last !== null && + (Date.parse(last) >= Date.parse(end) || (start !== null && Date.parse(last) < Date.parse(start)))) + ) + return bad() + if ( + total === 0 + ? r.ratio !== null + : typeof r.ratio !== 'number' || + !Number.isFinite(r.ratio) || + Math.abs(r.ratio - (100 * visitors) / total) > 1e-8 + ) + return bad() + return { + id, + parent_id, + name, + region, + visitors, + total_people: total, + ratio: r.ratio as number | null, + visits, + last_asked_at: last, + } + }) + departmentTree(rows, new Set()) + const byID = new Map(rows.map((r) => [r.id, r])) + for (const row of rows) { + const parent = byID.get(row.parent_id) + if ( + parent && + (parent.total_people < row.total_people || + parent.visitors < row.visitors || + parent.visits < row.visits || + (row.last_asked_at !== null && + (parent.last_asked_at === null || Date.parse(parent.last_asked_at) < Date.parse(row.last_asked_at)))) + ) + return bad() + } + return { + state: 'ready', + cache_key, + cache_hit: v.cache_hit, + retry_after: 0, + snapshot: { + rows, + total_people, + total_visits, + unmapped_visits, + organization, + regions, + period: query.period, + month: query.month ?? '', + start, + end, + generated_at: generated, + expires_at: expires, + }, + } +} +export async function fetchDepartmentStatistics( + query: DepartmentStatisticsQuery, + signal?: AbortSignal +): Promise { + const response = await fetch('/api/v1/qa-ops/departments/statistics', { + method: 'POST', + credentials: 'same-origin', + cache: 'no-store', + signal, + headers: { 'Content-Type': 'application/json', 'X-Governance-Action': 'qa-department-statistics' }, + body: JSON.stringify(query), + }) + const raw: unknown = await response.json().catch(() => null) + if (!response.ok) { + const error = raw && typeof raw === 'object' ? (raw as Record).error : undefined + throw Error(typeof error === 'string' ? error : `区域统计读取失败(HTTP ${response.status})`) + } + const data = parseDepartmentStatistics(obj(raw).data, query) + if ((response.status === 202) !== (data.state === 'pending')) return bad() + return data +} diff --git a/web/src/qaDepartmentTree.test.ts b/web/src/qaDepartmentTree.test.ts new file mode 100644 index 0000000..1a930b3 --- /dev/null +++ b/web/src/qaDepartmentTree.test.ts @@ -0,0 +1,26 @@ +import { it, expect } from 'vitest' +import { subtreeIDs, selectDepartmentBranch, departmentTree } from './qaRegionSelection' +const nodes = [ + { id: 'root', parent_id: '', name: 'Root' }, + { id: 'child', parent_id: 'root', name: 'Child' }, + { id: 'leaf', parent_id: 'child', name: 'Leaf' }, + { id: 'other', parent_id: 'root', name: 'Other' }, +] +it('selects a full branch and removes partial ancestors when a descendant is unchecked', () => { + expect(new Set(subtreeIDs(nodes, ['child']))).toEqual(new Set(['child', 'leaf'])) + const selected = selectDepartmentBranch(nodes, [], 'root', true) + expect(new Set(selected)).toEqual(new Set(nodes.map((d) => d.id))) + expect(new Set(selectDepartmentBranch(nodes, selected, 'leaf', false))).toEqual(new Set(['other'])) + expect(selected).toHaveLength(4) +}) +it('collapses hierarchy without dropping source rows or changing statistics', () => { + const before = JSON.stringify(nodes) + expect(departmentTree(nodes, new Set(['child'])).map((r) => r.department.id)).toEqual(['root', 'child', 'other']) + expect(departmentTree(nodes, new Set(['root']), 'Leaf').map((r) => r.department.id)).toEqual([ + 'root', + 'child', + 'leaf', + ]) + expect(JSON.stringify(nodes)).toBe(before) + expect(() => departmentTree([{ id: 'bad', parent_id: 'bad', name: 'Cycle' }], new Set())).toThrow() +}) diff --git a/web/src/qaRegionSelection.ts b/web/src/qaRegionSelection.ts index 0c5e2f6..58d88e5 100644 --- a/web/src/qaRegionSelection.ts +++ b/web/src/qaRegionSelection.ts @@ -1,4 +1,92 @@ import type { DepartmentRegion, RegionRule } from './qaOrg' +export type DepartmentNode = { id: string; parent_id: string; name: string } +export function subtreeIDs(nodes: DepartmentNode[], ids: string[]): string[] { + const children = new Map(), + known = new Set(nodes.map((n) => n.id)) + for (const node of nodes) { + const list = children.get(node.parent_id) ?? [] + list.push(node.id) + children.set(node.parent_id, list) + } + const seen = new Set(), + queue = [...ids] + while (queue.length) { + const id = queue.pop()! + if (!known.has(id)) throw Error('部门不在当前通讯录') + if (seen.has(id)) continue + seen.add(id) + queue.push(...(children.get(id) ?? [])) + } + return [...seen] +} +export function selectDepartmentBranch( + nodes: DepartmentNode[], + selected: string[], + id: string, + checked: boolean +): string[] { + const ids = subtreeIDs(nodes, [id]), + next = new Set(selected) + if (checked) ids.forEach((x) => next.add(x)) + else { + ids.forEach((x) => next.delete(x)) + const parents = new Map(nodes.map((n) => [n.id, n.parent_id])) + const seen = new Set() + let parent = parents.get(id) + while (parent && !seen.has(parent)) { + seen.add(parent) + next.delete(parent) + parent = parents.get(parent) + } + } + return [...next] +} +export function departmentTree( + nodes: T[], + collapsed: ReadonlySet, + search = '', + region = '' +): Array<{ department: T; depth: number; hasChildren: boolean }> { + const known = new Map(nodes.map((n) => [n.id, n])), + children = new Map() + if (known.size !== nodes.length) throw Error('通讯录部门重复') + for (const node of nodes) { + if (node.parent_id && !known.has(node.parent_id)) throw Error('通讯录缺少父部门') + const list = children.get(node.parent_id) ?? [] + list.push(node) + children.set(node.parent_id, list) + } + for (const list of children.values()) + list.sort((a, b) => a.name.localeCompare(b.name, 'zh-CN') || a.id.localeCompare(b.id)) + const all: Array<{ department: T; depth: number; hasChildren: boolean; parents: string[]; path: string }> = [], + seen = new Set() + const walk = (parent: string, parents: string[], names: string[]) => { + for (const node of children.get(parent) ?? []) { + if (seen.has(node.id) || parents.length > 100) throw Error('通讯录部门层级无效') + seen.add(node.id) + all.push({ + department: node, + depth: parents.length, + hasChildren: !!children.get(node.id)?.length, + parents, + path: [...names, node.name].join('/'), + }) + walk(node.id, [...parents, node.id], [...names, node.name]) + } + } + walk('', [], []) + if (all.length !== nodes.length) throw Error('通讯录部门存在循环') + if (search || region) { + const matches = all.filter( + (r) => + (!search || r.path.toLowerCase().includes(search.toLowerCase())) && + (!region || (r.department as DepartmentNode & { region?: string }).region === region) + ) + const visible = new Set(matches.flatMap((r) => [r.department.id, ...r.parents])) + return all.filter((r) => visible.has(r.department.id)) + } + return all.filter((r) => !r.parents.some((id) => collapsed.has(id))) +} export function applyBulkRegionRules(rules: RegionRule[], ids: string[], region: string): RegionRule[] { const selected = new Set(ids) if (!selected.size) return [...rules]