优化结构

internal/data/repository/announcement.go

@@ -3,9 +3,9 @@ package system
 import (
 	"context"
 	"encoding/json"
+	"kra/internal/biz/system"
 	"time"
 
-	"kra/internal/biz"
 	"kra/pkg/database/gormkit"
 	"kra/pkg/database/pagination"
 
@@ -27,17 +27,17 @@ func (announcementPO) TableName() string { return "sys_announcements" }
 
 type announcementRepo struct{ data Provider }
 
-func NewAnnouncementRepo(data Provider) biz.AnnouncementRepo { return &announcementRepo{data: data} }
+func NewAnnouncementRepo(data Provider) system.AnnouncementRepo { return &announcementRepo{data: data} }
 
-func newAnnouncement(item *biz.Announcement) announcementPO {
+func newAnnouncement(item *system.Announcement) announcementPO {
 	return announcementPO{ID: item.ID, Title: item.Title, Content: item.Content, UserID: item.UserID, Attachments: gormkit.JSON(item.Attachments)}
 }
 
-func announcementToBiz(item announcementPO) *biz.Announcement {
-	return &biz.Announcement{ID: item.ID, CreatedAt: item.CreatedAt, UpdatedAt: item.UpdatedAt, Title: item.Title, Content: item.Content, UserID: item.UserID, Attachments: json.RawMessage(item.Attachments)}
+func announcementToBiz(item announcementPO) *system.Announcement {
+	return &system.Announcement{ID: item.ID, CreatedAt: item.CreatedAt, UpdatedAt: item.UpdatedAt, Title: item.Title, Content: item.Content, UserID: item.UserID, Attachments: json.RawMessage(item.Attachments)}
 }
 
-func (r *announcementRepo) Create(ctx context.Context, item *biz.Announcement) error {
+func (r *announcementRepo) Create(ctx context.Context, item *system.Announcement) error {
 	po := newAnnouncement(item)
 	if err := r.data.DB().WithContext(ctx).Create(&po).Error; err != nil {
 		return err
@@ -54,12 +54,12 @@ func (r *announcementRepo) DeleteByIDs(ctx context.Context, ids []string) error
 	return r.data.DB().WithContext(ctx).Delete(&[]announcementPO{}, "id IN ?", ids).Error
 }
 
-func (r *announcementRepo) Update(ctx context.Context, item *biz.Announcement) error {
+func (r *announcementRepo) Update(ctx context.Context, item *system.Announcement) error {
 	po := newAnnouncement(item)
 	return r.data.DB().WithContext(ctx).Model(&announcementPO{}).Where("id = ?", item.ID).Updates(&po).Error
 }
 
-func (r *announcementRepo) Find(ctx context.Context, id string) (*biz.Announcement, error) {
+func (r *announcementRepo) Find(ctx context.Context, id string) (*system.Announcement, error) {
 	var po announcementPO
 	if err := r.data.DB().WithContext(ctx).Where("id = ?", id).First(&po).Error; err != nil {
 		return nil, err
@@ -67,7 +67,7 @@ func (r *announcementRepo) Find(ctx context.Context, id string) (*biz.Announceme
 	return announcementToBiz(po), nil
 }
 
-func (r *announcementRepo) List(ctx context.Context, filter biz.AnnouncementFilter) ([]*biz.Announcement, int64, error) {
+func (r *announcementRepo) List(ctx context.Context, filter system.AnnouncementFilter) ([]*system.Announcement, int64, error) {
 	db := r.data.DB().WithContext(ctx).Model(&announcementPO{})
 	if filter.StartCreatedAt != nil && filter.EndCreatedAt != nil {
 		db = db.Where("created_at BETWEEN ? AND ?", filter.StartCreatedAt, filter.EndCreatedAt)
@@ -83,14 +83,14 @@ func (r *announcementRepo) List(ctx context.Context, filter biz.AnnouncementFilt
 	if err := db.Find(&pos).Error; err != nil {
 		return nil, 0, err
 	}
-	items := make([]*biz.Announcement, 0, len(pos))
+	items := make([]*system.Announcement, 0, len(pos))
 	for _, po := range pos {
 		items = append(items, announcementToBiz(po))
 	}
 	return items, total, nil
 }
 
-func (r *announcementRepo) UserOptions(ctx context.Context) ([]biz.UserOption, error) {
+func (r *announcementRepo) UserOptions(ctx context.Context) ([]system.UserOption, error) {
 	var rows []struct {
 		Label string
 		Value uint
@@ -98,9 +98,9 @@ func (r *announcementRepo) UserOptions(ctx context.Context) ([]biz.UserOption, e
 	// The generated data-source endpoint is best effort: return collected
 	// options even when the underlying scan reports an error.
 	_ = r.data.DB().WithContext(ctx).Table("sys_users").Select("nick_name AS label, id AS value").Scan(&rows).Error
-	items := make([]biz.UserOption, 0, len(rows))
+	items := make([]system.UserOption, 0, len(rows))
 	for _, row := range rows {
-		items = append(items, biz.UserOption{Label: row.Label, Value: row.Value})
+		items = append(items, system.UserOption{Label: row.Label, Value: row.Value})
 	}
 	return items, nil
 }