优化结构

internal/service/announcement.go

@@ -3,9 +3,9 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"kra/internal/biz/system"
 	"time"
 
-	"kra/internal/biz"
 	"kra/internal/service/dto"
 )
 
@@ -17,18 +17,18 @@ type AnnouncementInput struct {
 	Attachments json.RawMessage
 }
 
-type AnnouncementService struct{ uc *biz.AnnouncementUsecase }
+type AnnouncementService struct{ uc *system.AnnouncementUsecase }
 
-func NewAnnouncementService(uc *biz.AnnouncementUsecase) *AnnouncementService {
+func NewAnnouncementService(uc *system.AnnouncementUsecase) *AnnouncementService {
 	return &AnnouncementService{uc: uc}
 }
 
-func announcementDTO(item *biz.Announcement) *dto.AnnouncementResponse {
+func announcementDTO(item *system.Announcement) *dto.AnnouncementResponse {
 	return &dto.AnnouncementResponse{ID: item.ID, CreatedAt: item.CreatedAt, UpdatedAt: item.UpdatedAt, DeletedAt: nil, Title: item.Title, Content: item.Content, UserID: item.UserID, Attachments: json.RawMessage(item.Attachments)}
 }
 
-func announcementDO(in AnnouncementInput) *biz.Announcement {
-	return &biz.Announcement{ID: in.ID, Title: in.Title, Content: in.Content, UserID: in.UserID, Attachments: in.Attachments}
+func announcementDO(in AnnouncementInput) *system.Announcement {
+	return &system.Announcement{ID: in.ID, Title: in.Title, Content: in.Content, UserID: in.UserID, Attachments: in.Attachments}
 }
 
 func (s *AnnouncementService) Create(ctx context.Context, in AnnouncementInput) error {
@@ -56,7 +56,7 @@ func (s *AnnouncementService) Find(ctx context.Context, id string) (*dto.Announc
 }
 
 func (s *AnnouncementService) List(ctx context.Context, page, pageSize int, start, end *time.Time) ([]*dto.AnnouncementResponse, int64, error) {
-	items, total, err := s.uc.List(ctx, biz.AnnouncementFilter{Page: page, PageSize: pageSize, StartCreatedAt: start, EndCreatedAt: end})
+	items, total, err := s.uc.List(ctx, system.AnnouncementFilter{Page: page, PageSize: pageSize, StartCreatedAt: start, EndCreatedAt: end})
 	if err != nil {
 		return nil, 0, err
 	}