yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成剩余模块 Context 超时控制改造

Browse Source
This commit is contained in:
yml2213
2026-06-10 12:58:59 +08:00
parent d2858c529d
commit 6ae8f0e830
24 changed files with 370 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/announcement/handler.go
+9 -9
View File
@@ -27,7 +27,7 @@ func (h *Handler) List(c *gin.Context) {
}
query.Page, query.PageSize = parsePagination(c)
result, err := h.service.List(query)
result, err := h.service.List(c.Request.Context(), query)
if err != nil {
response.InternalServerError(c, "获取公告列表失败")
return
@@ -44,7 +44,7 @@ func (h *Handler) GetByID(c *gin.Context) {
return
}
announcement, err := h.service.GetByID(id)
announcement, err := h.service.GetByID(c.Request.Context(), id)
if err != nil {
if errors.Is(err, ErrNotFound) {
response.NotFound(c, "公告不存在")
@@ -65,7 +65,7 @@ func (h *Handler) AdminList(c *gin.Context) {
}
query.Page, query.PageSize = parsePagination(c)
result, err := h.service.AdminList(query)
result, err := h.service.AdminList(c.Request.Context(), query)
if err != nil {
response.InternalServerError(c, "获取公告列表失败")
return
@@ -82,7 +82,7 @@ func (h *Handler) AdminGetByID(c *gin.Context) {
return
}
announcement, err := h.service.AdminGetByID(id)
announcement, err := h.service.AdminGetByID(c.Request.Context(), id)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
response.NotFound(c, "公告不存在")
@@ -109,7 +109,7 @@ func (h *Handler) Create(c *gin.Context) {
return
}
announcement, err := h.service.Create(req, adminID)
announcement, err := h.service.Create(c.Request.Context(), req, adminID)
if err != nil {
response.InternalServerError(c, "创建公告失败")
return
@@ -132,7 +132,7 @@ func (h *Handler) Update(c *gin.Context) {
return
}
announcement, err := h.service.Update(id, req)
announcement, err := h.service.Update(c.Request.Context(), id, req)
if err != nil {
response.InternalServerError(c, "更新公告失败")
return
@@ -149,7 +149,7 @@ func (h *Handler) Publish(c *gin.Context) {
return
}
if err := h.service.Publish(id); err != nil {
if err := h.service.Publish(c.Request.Context(), id); err != nil {
response.InternalServerError(c, "发布公告失败")
return
}
@@ -165,7 +165,7 @@ func (h *Handler) Archive(c *gin.Context) {
return
}
if err := h.service.Archive(id); err != nil {
if err := h.service.Archive(c.Request.Context(), id); err != nil {
response.InternalServerError(c, "归档公告失败")
return
}
@@ -181,7 +181,7 @@ func (h *Handler) Delete(c *gin.Context) {
return
}
if err := h.service.Delete(id); err != nil {
if err := h.service.Delete(c.Request.Context(), id); err != nil {
response.InternalServerError(c, "删除公告失败")
return
}
backend/internal/modules/announcement/repository.go
+22 -20
View File
@@ -1,6 +1,7 @@
package announcement
import (
"context"
"time"
"hfb_sys/backend/internal/model"
@@ -17,9 +18,9 @@ func NewRepository(db *gorm.DB) *Repository {
}
// List 获取公告列表（前台用户）
func (r *Repository) List(query AnnouncementListQuery) (*PaginatedResult, error) {
func (r *Repository) List(ctx context.Context, query AnnouncementListQuery) (*PaginatedResult, error) {
var total int64
tx := r.db.Model(&model.Announcement{}).Where("status = ?", "published")
tx := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("status = ?", "published")
if query.Category != "" {
tx = tx.Where("category = ?", query.Category)
@@ -52,23 +53,24 @@ func (r *Repository) List(query AnnouncementListQuery) (*PaginatedResult, error)
}
// GetByID 获取公告详情
func (r *Repository) GetByID(id uint64) (*AnnouncementDTO, error) {
func (r *Repository) GetByID(ctx context.Context, id uint64) (*AnnouncementDTO, error) {
var announcement model.Announcement
if err := r.db.Where("id = ? AND status = ?", id, "published").First(&announcement).Error; err != nil {
db := r.db.WithContext(ctx)
if err := db.Where("id = ? AND status = ?", id, "published").First(&announcement).Error; err != nil {
return nil, err
}
// 增加查看次数
r.db.Model(&model.Announcement{}).Where("id = ?", id).UpdateColumn("view_count", gorm.Expr("view_count + ?", 1))
db.Model(&model.Announcement{}).Where("id = ?", id).UpdateColumn("view_count", gorm.Expr("view_count + ?", 1))
dto := toAnnouncementDTO(announcement)
return &dto, nil
}
// AdminList 管理员获取公告列表
func (r *Repository) AdminList(query AnnouncementListQuery) (*PaginatedResult, error) {
func (r *Repository) AdminList(ctx context.Context, query AnnouncementListQuery) (*PaginatedResult, error) {
var total int64
tx := r.db.Model(&model.Announcement{})
tx := r.db.WithContext(ctx).Model(&model.Announcement{})
if query.Status != "" {
tx = tx.Where("status = ?", query.Status)
@@ -104,9 +106,9 @@ func (r *Repository) AdminList(query AnnouncementListQuery) (*PaginatedResult, e
}
// AdminGetByID 管理员获取公告详情
func (r *Repository) AdminGetByID(id uint64) (*AnnouncementDTO, error) {
func (r *Repository) AdminGetByID(ctx context.Context, id uint64) (*AnnouncementDTO, error) {
var announcement model.Announcement
if err := r.db.Where("id = ?", id).First(&announcement).Error; err != nil {
if err := r.db.WithContext(ctx).Where("id = ?", id).First(&announcement).Error; err != nil {
return nil, err
}
@@ -115,7 +117,7 @@ func (r *Repository) AdminGetByID(id uint64) (*AnnouncementDTO, error) {
}
// Create 创建公告
func (r *Repository) Create(req CreateAnnouncementRequest, createdBy uint64) (*AnnouncementDTO, error) {
func (r *Repository) Create(ctx context.Context, req CreateAnnouncementRequest, createdBy uint64) (*AnnouncementDTO, error) {
announcement := model.Announcement{
Title: req.Title,
Content: req.Content,
@@ -127,7 +129,7 @@ func (r *Repository) Create(req CreateAnnouncementRequest, createdBy uint64) (*A
CreatedBy: &createdBy,
}
if err := r.db.Create(&announcement).Error; err != nil {
if err := r.db.WithContext(ctx).Create(&announcement).Error; err != nil {
return nil, err
}
@@ -136,7 +138,7 @@ func (r *Repository) Create(req CreateAnnouncementRequest, createdBy uint64) (*A
}
// Update 更新公告
func (r *Repository) Update(id uint64, req UpdateAnnouncementRequest) (*AnnouncementDTO, error) {
func (r *Repository) Update(ctx context.Context, id uint64, req UpdateAnnouncementRequest) (*AnnouncementDTO, error) {
updates := make(map[string]interface{})
if req.Title != "" {
@@ -152,17 +154,17 @@ func (r *Repository) Update(id uint64, req UpdateAnnouncementRequest) (*Announce
updates["is_pinned"] = req.IsPinned
updates["is_important"] = req.IsImportant
if err := r.db.Model(&model.Announcement{}).Where("id = ?", id).Updates(updates).Error; err != nil {
if err := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id).Updates(updates).Error; err != nil {
return nil, err
}
return r.AdminGetByID(id)
return r.AdminGetByID(ctx, id)
}
// Publish 发布公告
func (r *Repository) Publish(id uint64) error {
func (r *Repository) Publish(ctx context.Context, id uint64) error {
now := time.Now()
return r.db.Model(&model.Announcement{}).
return r.db.WithContext(ctx).Model(&model.Announcement{}).
Where("id = ?", id).
Updates(map[string]interface{}{
"status": "published",
@@ -171,15 +173,15 @@ func (r *Repository) Publish(id uint64) error {
}
// Archive 归档公告
func (r *Repository) Archive(id uint64) error {
return r.db.Model(&model.Announcement{}).
func (r *Repository) Archive(ctx context.Context, id uint64) error {
return r.db.WithContext(ctx).Model(&model.Announcement{}).
Where("id = ?", id).
Update("status", "archived").Error
}
// Delete 删除公告
func (r *Repository) Delete(id uint64) error {
return r.db.Where("id = ?", id).Delete(&model.Announcement{}).Error
func (r *Repository) Delete(ctx context.Context, id uint64) error {
return r.db.WithContext(ctx).Where("id = ?", id).Delete(&model.Announcement{}).Error
}
func toAnnouncementDTO(a model.Announcement) AnnouncementDTO {
backend/internal/modules/announcement/service.go
+22 -21
View File
@@ -1,6 +1,7 @@
package announcement
import (
"context"
"errors"
"gorm.io/gorm"
@@ -15,13 +16,13 @@ func NewService(repo *Repository) *Service {
}
var (
ErrNotFound = errors.New("公告不存在")
ErrInvalidRequest = errors.New("请求参数不正确")
ErrUnauthorized = errors.New("未授权")
ErrNotFound = errors.New("公告不存在")
ErrInvalidRequest = errors.New("请求参数不正确")
ErrUnauthorized = errors.New("未授权")
)
// List 获取公告列表（前台用户）
func (s *Service) List(query AnnouncementListQuery) (*PaginatedResult, error) {
func (s *Service) List(ctx context.Context, query AnnouncementListQuery) (*PaginatedResult, error) {
if query.Page < 1 {
query.Page = 1
}
@@ -32,12 +33,12 @@ func (s *Service) List(query AnnouncementListQuery) (*PaginatedResult, error) {
query.PageSize = 100
}
return s.repo.List(query)
return s.repo.List(ctx, query)
}
// GetByID 获取公告详情
func (s *Service) GetByID(id uint64) (*AnnouncementDTO, error) {
dto, err := s.repo.GetByID(id)
func (s *Service) GetByID(ctx context.Context, id uint64) (*AnnouncementDTO, error) {
dto, err := s.repo.GetByID(ctx, id)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, ErrNotFound
@@ -48,7 +49,7 @@ func (s *Service) GetByID(id uint64) (*AnnouncementDTO, error) {
}
// AdminList 管理员获取公告列表
func (s *Service) AdminList(query AnnouncementListQuery) (*PaginatedResult, error) {
func (s *Service) AdminList(ctx context.Context, query AnnouncementListQuery) (*PaginatedResult, error) {
if query.Page < 1 {
query.Page = 1
}
@@ -59,12 +60,12 @@ func (s *Service) AdminList(query AnnouncementListQuery) (*PaginatedResult, erro
query.PageSize = 100
}
return s.repo.AdminList(query)
return s.repo.AdminList(ctx, query)
}
// AdminGetByID 管理员获取公告详情
func (s *Service) AdminGetByID(id uint64) (*AnnouncementDTO, error) {
dto, err := s.repo.AdminGetByID(id)
func (s *Service) AdminGetByID(ctx context.Context, id uint64) (*AnnouncementDTO, error) {
dto, err := s.repo.AdminGetByID(ctx, id)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, ErrNotFound
@@ -75,26 +76,26 @@ func (s *Service) AdminGetByID(id uint64) (*AnnouncementDTO, error) {
}
// Create 创建公告
func (s *Service) Create(req CreateAnnouncementRequest, createdBy uint64) (*AnnouncementDTO, error) {
return s.repo.Create(req, createdBy)
func (s *Service) Create(ctx context.Context, req CreateAnnouncementRequest, createdBy uint64) (*AnnouncementDTO, error) {
return s.repo.Create(ctx, req, createdBy)
}
// Update 更新公告
func (s *Service) Update(id uint64, req UpdateAnnouncementRequest) (*AnnouncementDTO, error) {
return s.repo.Update(id, req)
func (s *Service) Update(ctx context.Context, id uint64, req UpdateAnnouncementRequest) (*AnnouncementDTO, error) {
return s.repo.Update(ctx, id, req)
}
// Publish 发布公告
func (s *Service) Publish(id uint64) error {
return s.repo.Publish(id)
func (s *Service) Publish(ctx context.Context, id uint64) error {
return s.repo.Publish(ctx, id)
}
// Archive 归档公告
func (s *Service) Archive(id uint64) error {
return s.repo.Archive(id)
func (s *Service) Archive(ctx context.Context, id uint64) error {
return s.repo.Archive(ctx, id)
}
// Delete 删除公告
func (s *Service) Delete(id uint64) error {
return s.repo.Delete(id)
func (s *Service) Delete(ctx context.Context, id uint64) error {
return s.repo.Delete(ctx, id)
}