feat(assets): 任务/企业资产列表改服务端分页,去掉 50 条上限

- db: QueryByTask/QueryByCompany 加 offset 参数,limit<=0 不再兜底成 50/200 而是不限量;新增 CountByTask/CountByCompany/CountsByTypeForTask; 抽出共享 pageClause 与 scanTypeCounts。 - server: /assets 的 task_id/company_id 分支改用真实 total(不再是 len(assets));/assets/counts 支持 ?task_id= 返回按类型计数。 - web: taskAssets(taskId,type,limit,offset) 返回 {assets,total}; assetCounts(taskId?);assets-tab 改为只取当前分类当前页,分类徽章走 counts 接口,分页器 100/200 真正可用,轮询变轻。 - 补 TestQueryByTaskPaging/TestQueryByCompanyPaging 回归(60 条 25/页翻页不重不漏)。
2026-08-19 09:17:13 -04:00
1 parent 5244500fee
commit 8e9b126972
@@ -913,10 +913,8 @@ func (s *AssetStore) CountByType(typ string) (int, error) {
 }

 // QueryByCompany returns assets for a company, optionally filtered by type.
-func (s *AssetStore) QueryByCompany(companyID int64, typ string, limit int) ([]*Asset, error) {
-	if limit <= 0 {
-		limit = 200
-	}
+// limit <= 0 means no limit — pair it with CountByCompany for server-side paging.
+func (s *AssetStore) QueryByCompany(companyID int64, typ string, limit, offset int) ([]*Asset, error) {
 	q := `SELECT id, type, company_id, array_to_json(task_ids)::text,
       COALESCE(domain,''), COALESCE(root_domain,''), COALESCE(ip,''),
       COALESCE(c_segment::text,''), port,
@@ -933,8 +931,7 @@ FROM assets WHERE company_id = $1`
 		args = append(args, typ)
 		q += fmt.Sprintf(` AND type = $%d`, len(args))
 	}
-	args = append(args, limit)
-	q += fmt.Sprintf(` ORDER BY last_seen DESC LIMIT $%d`, len(args))
+	q += pageClause(&args, limit, offset)
 	rows, err := s.db.Query(q, args...)
 	if err != nil {
 		return nil, err
@@ -943,11 +940,38 @@ FROM assets WHERE company_id = $1`
 	return scanAssets(rows)
 }

-// QueryByTask returns assets rows that have a given task_id in task_ids.
-func (s *AssetStore) QueryByTask(taskID int64, typ string, limit int) ([]*Asset, error) {
-	if limit <= 0 {
-		limit = 200
+// CountByCompany returns the full number of assets attributed to a company
+// (optionally filtered by type), ignoring limit/offset.
+func (s *AssetStore) CountByCompany(companyID int64, typ string) (int, error) {
+	q := `SELECT count(*) FROM assets WHERE company_id = $1`
+	args := []any{companyID}
+	if typ != "" {
+		args = append(args, typ)
+		q += fmt.Sprintf(` AND type = $%d`, len(args))
 	}
+	var n int
+	err := s.db.QueryRow(q, args...).Scan(&n)
+	return n, err
+}
+
+// pageClause appends limit/offset placeholders to args and returns the trailing
+// ORDER BY … LIMIT … OFFSET fragment. limit <= 0 means no limit.
+func pageClause(args *[]any, limit, offset int) string {
+	q := ` ORDER BY last_seen DESC`
+	if limit > 0 {
+		*args = append(*args, limit)
+		q += fmt.Sprintf(` LIMIT $%d`, len(*args))
+	}
+	if offset > 0 {
+		*args = append(*args, offset)
+		q += fmt.Sprintf(` OFFSET $%d`, len(*args))
+	}
+	return q
+}
+
+// QueryByTask returns assets rows that have a given task_id in task_ids.
+// limit <= 0 means no limit — pair it with CountByTask for server-side paging.
+func (s *AssetStore) QueryByTask(taskID int64, typ string, limit, offset int) ([]*Asset, error) {
 	q := `SELECT id, type, company_id, array_to_json(task_ids)::text,
       COALESCE(domain,''), COALESCE(root_domain,''), COALESCE(ip,''),
       COALESCE(c_segment::text,''), port,
@@ -964,8 +988,7 @@ FROM assets WHERE $1 = ANY(task_ids)`
 		args = append(args, typ)
 		q += fmt.Sprintf(` AND type = $%d`, len(args))
 	}
-	args = append(args, limit)
-	q += fmt.Sprintf(` ORDER BY last_seen DESC LIMIT $%d`, len(args))
+	q += pageClause(&args, limit, offset)
 	rows, err := s.db.Query(q, args...)
 	if err != nil {
 		return nil, err
@@ -974,6 +997,30 @@ FROM assets WHERE $1 = ANY(task_ids)`
 	return scanAssets(rows)
 }

+// CountByTask returns the full number of assets attached to a task (optionally
+// filtered by type), ignoring limit/offset — lets the UI paginate on the server.
+func (s *AssetStore) CountByTask(taskID int64, typ string) (int, error) {
+	q := `SELECT count(*) FROM assets WHERE $1 = ANY(task_ids)`
+	args := []any{taskID}
+	if typ != "" {
+		args = append(args, typ)
+		q += fmt.Sprintf(` AND type = $%d`, len(args))
+	}
+	var n int
+	err := s.db.QueryRow(q, args...).Scan(&n)
+	return n, err
+}
+
+// CountsByTypeForTask returns asset counts per type for a single task.
+func (s *AssetStore) CountsByTypeForTask(taskID int64) (map[string]int, error) {
+	rows, err := s.db.Query(`SELECT type, COUNT(*) FROM assets WHERE $1 = ANY(task_ids) GROUP BY type`, taskID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	return scanTypeCounts(rows)
+}
+
 const assetSelectCols = `SELECT id, type, company_id, array_to_json(task_ids)::text,
       COALESCE(domain,''), COALESCE(root_domain,''), COALESCE(ip,''),
       COALESCE(c_segment::text,''), port,
@@ -1072,6 +1119,11 @@ func (s *AssetStore) CountsByType() (map[string]int, error) {
 		return nil, err
 	}
 	defer rows.Close()
+	return scanTypeCounts(rows)
+}
+
+// scanTypeCounts scans a (type, count) result set into a map.
+func scanTypeCounts(rows *sql.Rows) (map[string]int, error) {
 	out := map[string]int{}
 	for rows.Next() {
 		var typ string
@@ -1,6 +1,7 @@
 package db

 import (
+	"fmt"
 	"testing"
 )

@@ -545,7 +546,7 @@ func TestQueryByTask(t *testing.T) {
 	}
 	defer deleteAsset(d, id)

-	assets, err := av2.QueryByTask(taskID, "", 10)
+	assets, err := av2.QueryByTask(taskID, "", 10, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -558,6 +559,73 @@ func TestQueryByTask(t *testing.T) {
 	if !found {
 		t.Error("QueryByTask: inserted asset not found")
 	}
+
+	n, err := av2.CountByTask(taskID, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n < 1 {
+		t.Errorf("CountByTask: got %d, want >= 1", n)
+	}
+	if counts, err := av2.CountsByTypeForTask(taskID); err != nil {
+		t.Fatal(err)
+	} else if counts["root_domain"] < 1 {
+		t.Errorf("CountsByTypeForTask: root_domain = %d, want >= 1", counts["root_domain"])
+	}
+
+	// offset past the end must return nothing, not fall back to page 1
+	rest, err := av2.QueryByTask(taskID, "", 10, n)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(rest) != 0 {
+		t.Errorf("QueryByTask offset=%d: got %d rows, want 0", n, len(rest))
+	}
+}
+
+// 任务资产列表按页取,不再被固定条数截断:60 条资产用 25/页要能完整翻出来。
+func TestQueryByTaskPaging(t *testing.T) {
+	d, av2, _ := testSetup(t)
+	defer d.Close()
+
+	const taskID = int64(99998)
+	const n = 60
+	for i := 0; i < n; i++ {
+		id, err := av2.UpsertRootDomain(UpsertRootDomainReq{
+			Domain: fmt.Sprintf("paging-%02d.querybytask.test", i),
+			TaskID: taskID,
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer deleteAsset(d, id)
+	}
+
+	total, err := av2.CountByTask(taskID, "root_domain")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if total != n {
+		t.Fatalf("CountByTask: got %d, want %d", total, n)
+	}
+
+	const size = 25
+	seen := map[int64]bool{}
+	for offset := 0; offset < total; offset += size {
+		page, err := av2.QueryByTask(taskID, "root_domain", size, offset)
+		if err != nil {
+			t.Fatal(err)
+		}
+		for _, a := range page {
+			if seen[a.ID] {
+				t.Errorf("offset=%d: asset %d returned twice", offset, a.ID)
+			}
+			seen[a.ID] = true
+		}
+	}
+	if len(seen) != n {
+		t.Errorf("paged through %d assets, want %d", len(seen), n)
+	}
 }

 func TestQueryByCompany(t *testing.T) {
@@ -582,7 +650,7 @@ func TestQueryByCompany(t *testing.T) {
 		t.Fatal(err)
 	}

-	assets, err := av2.QueryByCompany(companyID, "root_domain", 10)
+	assets, err := av2.QueryByCompany(companyID, "root_domain", 10, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -595,6 +663,77 @@ func TestQueryByCompany(t *testing.T) {
 	if !found {
 		t.Error("QueryByCompany: attributed asset not found")
 	}
+
+	n, err := av2.CountByCompany(companyID, "root_domain")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n < 1 {
+		t.Errorf("CountByCompany: got %d, want >= 1", n)
+	}
+
+	// offset past the end must return nothing, not fall back to page 1
+	rest, err := av2.QueryByCompany(companyID, "root_domain", 10, n)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(rest) != 0 {
+		t.Errorf("QueryByCompany offset=%d: got %d rows, want 0", n, len(rest))
+	}
+}
+
+// 企业资产列表同样按页取,不被固定条数截断。
+func TestQueryByCompanyPaging(t *testing.T) {
+	d, av2, cs := testSetup(t)
+	defer d.Close()
+
+	companyID, _, err := cs.UpsertCompany("QueryByCompanyPagingCorp", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer cleanupCompany(d, companyID)
+
+	if added, _, _, errs := cs.AddScope(companyID, []string{"qbc-paging.io"}, "test"); added != 1 {
+		t.Fatalf("AddScope: added=%d, errors=%v", added, errs)
+	}
+
+	// UpsertSubdomain 会顺带建根域名资产,一并清掉
+	defer d.Exec(`DELETE FROM assets WHERE root_domain = 'qbc-paging.io'`)
+
+	const n = 60
+	for i := 0; i < n; i++ {
+		if _, err := av2.UpsertSubdomain(UpsertSubdomainReq{
+			Domain: fmt.Sprintf("paging-%02d.qbc-paging.io", i),
+		}); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	total, err := av2.CountByCompany(companyID, "subdomain")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if total != n {
+		t.Fatalf("CountByCompany: got %d, want %d", total, n)
+	}
+
+	const size = 25
+	seen := map[int64]bool{}
+	for offset := 0; offset < total; offset += size {
+		page, err := av2.QueryByCompany(companyID, "subdomain", size, offset)
+		if err != nil {
+			t.Fatal(err)
+		}
+		for _, a := range page {
+			if seen[a.ID] {
+				t.Errorf("offset=%d: asset %d returned twice", offset, a.ID)
+			}
+			seen[a.ID] = true
+		}
+	}
+	if len(seen) != n {
+		t.Errorf("paged through %d assets, want %d", len(seen), n)
+	}
 }

 func TestCountsByType(t *testing.T) {