feat(distribution): 公告中心支持分站自定义

公告中心（前台公告列表/详情）此前完全没有站点概念，分站访客只能看到主站公告。本次按「默认继承主站、站长可切仅本站」的口径支持分站自定义。数据与口径： - 新增 announcements.distribution_site_id（0=主站），前台按站点隔离 - 新增 distribution_sites.announcement_mode：inherit（默认，主站+本站）/ own_only（仅本站）后端： - 公告模块新增 ResolvePublicSiteScope：主站 [0]、inherit [0, siteID]、own_only [siteID]，站点编码无效/已停用回落主站；列表与详情都按该范围过滤，详情不再允许跨站按 ID 读取 - 管理端公告列表支持按站点筛选（site_id：不传=全部，0=主站，>0=分站）并带出站点名 - 分销模块新增本站公告 CRUD（distribution/announcement.go）：强制 distribution_site_id=本站，先过 ensureSiteAccess，跨站更新/删除/上下架一律 ErrAnnouncementNotFound - UpdateSiteBranding 支持 announcement_mode 切换（非法值报错，读侧非法历史值回落 inherit） - 新增权限 distribution:announcement_view|manage 并授予 super_admin/ops/finance，站长开通时继承 ops 角色即自动获得 - 路由：站长侧 /api/distribution/announcements*，平台侧 /api/admin/distribution/announcements* 前端： - 分销后台新增「公告中心」页：来源开关（继承主站+本站 / 仅本站）、本站公告列表与新建/编辑/发布/下架/归档/恢复/删除，空态按来源模式给出引导 - 平台后台公告页新增「站点」列与筛选，新建公告可选择归属站点（主站或指定分站代发） - 前台 PC/移动无需改动：请求已带 X-Distribution-Site-Code，后端按站点隔离，页面已有空态测试： - 公告模块：主站/继承/仅本站三种可见范围、跨站详情拦截、无效站点回落、管理端站点筛选 - 分销模块：本站公告 CRUD 与跨站防护、公告来源开关校验与非法值容错
2026-10-01 10:02:31 +08:00
parent 329d0f75bb
commit 2a76d59a30
24 changed files with 1676 additions and 88 deletions
@@ -2,6 +2,8 @@ package announcement

 import (
 	"context"
+	"errors"
+	"strings"
 	"time"

 	"hfb_sys/backend/internal/model"
@@ -17,11 +19,41 @@ func NewRepository(db *gorm.DB) *Repository {
 	return &Repository{db: db}
 }

+// ResolvePublicSiteScope 解析前台请求应看到的公告归属站点集合。
+//
+//   - 主站（无站点编码）：只看主站公告 [0]
+//   - 分站 inherit：主站公告 + 本站公告 [0, siteID]
+//   - 分站 own_only：仅本站公告 [siteID]
+//   - 站点编码无效/已停用：回落主站，与前台站点探测失败的兜底一致
+func (r *Repository) ResolvePublicSiteScope(ctx context.Context, siteCode string) ([]uint64, error) {
+	code := strings.TrimSpace(siteCode)
+	if code == "" {
+		return []uint64{0}, nil
+	}
+	var site model.DistributionSite
+	err := r.db.WithContext(ctx).Select("id", "announcement_mode").
+		Where("site_code = ? AND status = ?", code, "active").First(&site).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return []uint64{0}, nil
+		}
+		return nil, err
+	}
+	if strings.TrimSpace(site.AnnouncementMode) == model.AnnouncementModeOwnOnly {
+		return []uint64{site.ID}, nil
+	}
+	return []uint64{0, site.ID}, nil
+}
+
 // List 获取公告列表（前台用户）
 func (r *Repository) List(ctx context.Context, query AnnouncementListQuery) (*PaginatedResult, error) {
 	var total int64
 	tx := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("status = ?", "published")

+	if len(query.AllowedSiteIDs) > 0 {
+		tx = tx.Where("distribution_site_id IN ?", query.AllowedSiteIDs)
+	}
+
 	if query.Category != "" {
 		tx = tx.Where("category = ?", query.Category)
 	}
@@ -52,11 +84,15 @@ func (r *Repository) List(ctx context.Context, query AnnouncementListQuery) (*Pa
 	}, nil
 }

-// GetByID 获取公告详情
-func (r *Repository) GetByID(ctx context.Context, id uint64) (*AnnouncementDTO, error) {
+// GetByID 获取公告详情（限前台可见的站点范围，避免跨站按 ID 读取）
+func (r *Repository) GetByID(ctx context.Context, id uint64, allowedSiteIDs []uint64) (*AnnouncementDTO, error) {
 	var announcement model.Announcement
 	db := r.db.WithContext(ctx)
-	if err := db.Where("id = ? AND status = ?", id, "published").First(&announcement).Error; err != nil {
+	query := db.Where("id = ? AND status = ?", id, "published")
+	if len(allowedSiteIDs) > 0 {
+		query = query.Where("distribution_site_id IN ?", allowedSiteIDs)
+	}
+	if err := query.First(&announcement).Error; err != nil {
 		return nil, err
 	}

@@ -67,34 +103,26 @@ func (r *Repository) GetByID(ctx context.Context, id uint64) (*AnnouncementDTO,
 	return &dto, nil
 }

-// AdminList 管理员获取公告列表
+// AdminList 管理员获取公告列表（可按站点筛选，含草稿/归档）
 func (r *Repository) AdminList(ctx context.Context, query AnnouncementListQuery) (*PaginatedResult, error) {
+	base := r.adminListBase(ctx, query)
+
 	var total int64
-	tx := r.db.WithContext(ctx).Model(&model.Announcement{})
-
-	if query.Status != "" {
-		tx = tx.Where("status = ?", query.Status)
-	}
-	if query.Category != "" {
-		tx = tx.Where("category = ?", query.Category)
-	}
-
-	if err := tx.Count(&total).Error; err != nil {
+	if err := base.Session(&gorm.Session{}).Count(&total).Error; err != nil {
 		return nil, err
 	}

 	offset := (query.Page - 1) * query.PageSize
-	var rows []model.Announcement
-	if err := tx.Order("is_pinned DESC, priority DESC, id DESC").
+	var items []AnnouncementDTO
+	if err := base.Session(&gorm.Session{}).
+		Order("a.is_pinned DESC, a.priority DESC, a.id DESC").
 		Offset(offset).
 		Limit(query.PageSize).
-		Find(&rows).Error; err != nil {
+		Scan(&items).Error; err != nil {
 		return nil, err
 	}
-
-	items := make([]AnnouncementDTO, 0, len(rows))
-	for _, row := range rows {
-		items = append(items, toAnnouncementDTO(row))
+	if items == nil {
+		items = []AnnouncementDTO{}
 	}

 	return &PaginatedResult{
@@ -105,28 +133,50 @@ func (r *Repository) AdminList(ctx context.Context, query AnnouncementListQuery)
 	}, nil
 }

-// AdminGetByID 管理员获取公告详情
+// adminListBase 管理端公告列表基础查询：带站点名，支持状态/分类/站点筛选。
+func (r *Repository) adminListBase(ctx context.Context, query AnnouncementListQuery) *gorm.DB {
+	base := r.db.WithContext(ctx).Table("announcements AS a").
+		Select("a.id, a.distribution_site_id, COALESCE(s.site_name, '') AS distribution_site_name, a.title, a.content, a.category, a.priority, a.is_pinned, a.is_important, a.view_count, a.status, a.published_at, a.created_at, a.updated_at").
+		Joins("LEFT JOIN distribution_sites AS s ON s.id = a.distribution_site_id")
+
+	if query.Status != "" {
+		base = base.Where("a.status = ?", query.Status)
+	}
+	if query.Category != "" {
+		base = base.Where("a.category = ?", query.Category)
+	}
+	if query.AdminSiteID != nil {
+		base = base.Where("a.distribution_site_id = ?", *query.AdminSiteID)
+	}
+	return base
+}
+
+// AdminGetByID 管理员获取公告详情（带站点名）
 func (r *Repository) AdminGetByID(ctx context.Context, id uint64) (*AnnouncementDTO, error) {
-	var announcement model.Announcement
-	if err := r.db.WithContext(ctx).Where("id = ?", id).First(&announcement).Error; err != nil {
+	var dto AnnouncementDTO
+	if err := r.adminListBase(ctx, AnnouncementListQuery{}).
+		Where("a.id = ?", id).
+		Scan(&dto).Error; err != nil {
 		return nil, err
 	}
-
-	dto := toAnnouncementDTO(announcement)
+	if dto.ID == 0 {
+		return nil, gorm.ErrRecordNotFound
+	}
 	return &dto, nil
 }

 // Create 创建公告
 func (r *Repository) Create(ctx context.Context, req CreateAnnouncementRequest, createdBy uint64) (*AnnouncementDTO, error) {
 	announcement := model.Announcement{
-		Title:       req.Title,
-		Content:     req.Content,
-		Category:    req.Category,
-		Priority:    req.Priority,
-		IsPinned:    req.IsPinned,
-		IsImportant: req.IsImportant,
-		Status:      "draft",
-		CreatedBy:   &createdBy,
+		DistributionSiteID: req.DistributionSiteID,
+		Title:              req.Title,
+		Content:            req.Content,
+		Category:           req.Category,
+		Priority:           req.Priority,
+		IsPinned:           req.IsPinned,
+		IsImportant:        req.IsImportant,
+		Status:             "draft",
+		CreatedBy:          &createdBy,
 	}

 	if err := r.db.WithContext(ctx).Create(&announcement).Error; err != nil {
@@ -197,17 +247,18 @@ func (r *Repository) Delete(ctx context.Context, id uint64) error {

 func toAnnouncementDTO(a model.Announcement) AnnouncementDTO {
 	return AnnouncementDTO{
-		ID:          a.ID,
-		Title:       a.Title,
-		Content:     a.Content,
-		Category:    a.Category,
-		Priority:    a.Priority,
-		IsPinned:    a.IsPinned,
-		IsImportant: a.IsImportant,
-		ViewCount:   a.ViewCount,
-		Status:      a.Status,
-		PublishedAt: a.PublishedAt,
-		CreatedAt:   a.CreatedAt,
-		UpdatedAt:   a.UpdatedAt,
+		ID:                 a.ID,
+		DistributionSiteID: a.DistributionSiteID,
+		Title:              a.Title,
+		Content:            a.Content,
+		Category:           a.Category,
+		Priority:           a.Priority,
+		IsPinned:           a.IsPinned,
+		IsImportant:        a.IsImportant,
+		ViewCount:          a.ViewCount,
+		Status:             a.Status,
+		PublishedAt:        a.PublishedAt,
+		CreatedAt:          a.CreatedAt,
+		UpdatedAt:          a.UpdatedAt,
 	}
 }