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/adminrole/handler.go
+7 -7
View File
@@ -19,7 +19,7 @@ func NewHandler(service *Service) *Handler {
}
func (h *Handler) List(c *gin.Context) {
items, err := h.service.List()
items, err := h.service.List(c.Request.Context())
if err != nil {
writeError(c, err)
return
@@ -32,7 +32,7 @@ func (h *Handler) FindByID(c *gin.Context) {
if !ok {
return
}
item, err := h.service.FindByID(id)
item, err := h.service.FindByID(c.Request.Context(), id)
if err != nil {
writeError(c, err)
return
@@ -46,7 +46,7 @@ func (h *Handler) Create(c *gin.Context) {
response.BadRequest(c, "角色编码和名称不能为空")
return
}
item, err := h.service.Create(req)
item, err := h.service.Create(c.Request.Context(), req)
if err != nil {
writeError(c, err)
return
@@ -64,7 +64,7 @@ func (h *Handler) Update(c *gin.Context) {
response.BadRequest(c, "角色名称不能为空")
return
}
item, err := h.service.Update(id, req)
item, err := h.service.Update(c.Request.Context(), id, req)
if err != nil {
writeError(c, err)
return
@@ -77,7 +77,7 @@ func (h *Handler) Delete(c *gin.Context) {
if !ok {
return
}
if err := h.service.Delete(id); err != nil {
if err := h.service.Delete(c.Request.Context(), id); err != nil {
writeError(c, err)
return
}
@@ -94,7 +94,7 @@ func (h *Handler) AssignPermissions(c *gin.Context) {
response.BadRequest(c, "请求格式不正确")
return
}
if err := h.service.AssignPermissions(id, req); err != nil {
if err := h.service.AssignPermissions(c.Request.Context(), id, req); err != nil {
writeError(c, err)
return
}
@@ -102,7 +102,7 @@ func (h *Handler) AssignPermissions(c *gin.Context) {
}
func (h *Handler) ListPermissions(c *gin.Context) {
items, err := h.service.ListPermissions()
items, err := h.service.ListPermissions(c.Request.Context())
if err != nil {
writeError(c, err)
return
backend/internal/modules/adminrole/repository.go
+32 -26
View File
@@ -1,6 +1,7 @@
package adminrole
import (
"context"
"errors"
"hfb_sys/backend/internal/model"
@@ -17,18 +18,19 @@ func NewRepository(db *gorm.DB) *Repository {
return &Repository{db: db}
}
func (r *Repository) List() ([]RoleDTO, error) {
func (r *Repository) List(ctx context.Context) ([]RoleDTO, error) {
db := r.db.WithContext(ctx)
var roles []model.Role
if err := r.db.Order("id ASC").Find(&roles).Error; err != nil {
if err := db.Order("id ASC").Find(&roles).Error; err != nil {
return nil, err
}
result := make([]RoleDTO, 0, len(roles))
for _, role := range roles {
var count int64
if role.Code == "super_admin" {
r.db.Model(&model.Permission{}).Count(&count)
db.Model(&model.Permission{}).Count(&count)
} else {
r.db.Model(&model.RolePermission{}).Where("role_id = ?", role.ID).Count(&count)
db.Model(&model.RolePermission{}).Where("role_id = ?", role.ID).Count(&count)
}
result = append(result, RoleDTO{
ID: role.ID,
@@ -43,17 +45,17 @@ func (r *Repository) List() ([]RoleDTO, error) {
return result, nil
}
func (r *Repository) FindByID(id uint64) (*RoleDTO, error) {
func (r *Repository) FindByID(ctx context.Context, id uint64) (*RoleDTO, error) {
var role model.Role
if err := r.db.First(&role, id).Error; err != nil {
if err := r.db.WithContext(ctx).First(&role, id).Error; err != nil {
return nil, err
}
var perms []PermissionDTO
var err error
if role.Code == "super_admin" {
perms, err = r.ListPermissions()
perms, err = r.ListPermissions(ctx)
} else {
perms, err = r.getRolePermissions(id)
perms, err = r.getRolePermissions(ctx, id)
}
if err != nil {
return nil, err
@@ -71,40 +73,42 @@ func (r *Repository) FindByID(id uint64) (*RoleDTO, error) {
return &dto, nil
}
func (r *Repository) Create(req CreateRoleRequest) (*RoleDTO, error) {
func (r *Repository) Create(ctx context.Context, req CreateRoleRequest) (*RoleDTO, error) {
role := model.Role{
Code: req.Code,
Name: req.Name,
Description: req.Description,
}
if err := r.db.Create(&role).Error; err != nil {
if err := r.db.WithContext(ctx).Create(&role).Error; err != nil {
return nil, err
}
return r.FindByID(role.ID)
return r.FindByID(ctx, role.ID)
}
func (r *Repository) Update(id uint64, req UpdateRoleRequest) (*RoleDTO, error) {
func (r *Repository) Update(ctx context.Context, id uint64, req UpdateRoleRequest) (*RoleDTO, error) {
db := r.db.WithContext(ctx)
var role model.Role
if err := r.db.First(&role, id).Error; err != nil {
if err := db.First(&role, id).Error; err != nil {
return nil, err
}
role.Name = req.Name
role.Description = req.Description
if err := r.db.Save(&role).Error; err != nil {
if err := db.Save(&role).Error; err != nil {
return nil, err
}
return r.FindByID(id)
return r.FindByID(ctx, id)
}
func (r *Repository) Delete(id uint64) error {
func (r *Repository) Delete(ctx context.Context, id uint64) error {
db := r.db.WithContext(ctx)
var role model.Role
if err := r.db.First(&role, id).Error; err != nil {
if err := db.First(&role, id).Error; err != nil {
return err
}
if role.Code == "super_admin" {
return ErrProtectedRole
}
return r.db.Transaction(func(tx *gorm.DB) error {
return db.Transaction(func(tx *gorm.DB) error {
if err := tx.Where("role_id = ?", id).Delete(&model.RolePermission{}).Error; err != nil {
return err
}
@@ -115,12 +119,13 @@ func (r *Repository) Delete(id uint64) error {
})
}
func (r *Repository) AssignPermissions(roleID uint64, permIDs []uint64) error {
func (r *Repository) AssignPermissions(ctx context.Context, roleID uint64, permIDs []uint64) error {
db := r.db.WithContext(ctx)
var role model.Role
if err := r.db.First(&role, roleID).Error; err != nil {
if err := db.First(&role, roleID).Error; err != nil {
return err
}
return r.db.Transaction(func(tx *gorm.DB) error {
return db.Transaction(func(tx *gorm.DB) error {
if role.Code == "super_admin" {
var allPermIDs []uint64
if err := tx.Model(&model.Permission{}).Pluck("id", &allPermIDs).Error; err != nil {
@@ -141,9 +146,9 @@ func (r *Repository) AssignPermissions(roleID uint64, permIDs []uint64) error {
})
}
func (r *Repository) ListPermissions() ([]PermissionDTO, error) {
func (r *Repository) ListPermissions(ctx context.Context) ([]PermissionDTO, error) {
var perms []model.Permission
if err := r.db.Order("resource ASC, action ASC").Find(&perms).Error; err != nil {
if err := r.db.WithContext(ctx).Order("resource ASC, action ASC").Find(&perms).Error; err != nil {
return nil, err
}
result := make([]PermissionDTO, 0, len(perms))
@@ -155,9 +160,10 @@ func (r *Repository) ListPermissions() ([]PermissionDTO, error) {
return result, nil
}
func (r *Repository) getRolePermissions(roleID uint64) ([]PermissionDTO, error) {
func (r *Repository) getRolePermissions(ctx context.Context, roleID uint64) ([]PermissionDTO, error) {
db := r.db.WithContext(ctx)
var rps []model.RolePermission
if err := r.db.Where("role_id = ?", roleID).Find(&rps).Error; err != nil {
if err := db.Where("role_id = ?", roleID).Find(&rps).Error; err != nil {
return nil, err
}
if len(rps) == 0 {
@@ -168,7 +174,7 @@ func (r *Repository) getRolePermissions(roleID uint64) ([]PermissionDTO, error)
ids = append(ids, rp.PermissionID)
}
var perms []model.Permission
if err := r.db.Where("id IN ?", ids).Find(&perms).Error; err != nil {
if err := db.Where("id IN ?", ids).Find(&perms).Error; err != nil {
return nil, err
}
result := make([]PermissionDTO, 0, len(perms))
backend/internal/modules/adminrole/service.go
+18 -15
View File
@@ -1,6 +1,9 @@
package adminrole
import "errors"
import (
"context"
"errors"
)
var ErrDependencyUnavailable = errors.New("dependency unavailable")
@@ -12,54 +15,54 @@ func NewService(repo *Repository) *Service {
return &Service{repo: repo}
}
func (s *Service) List() ([]RoleDTO, error) {
func (s *Service) List(ctx context.Context) ([]RoleDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
return s.repo.List()
return s.repo.List(ctx)
}
func (s *Service) FindByID(id uint64) (*RoleDTO, error) {
func (s *Service) FindByID(ctx context.Context, id uint64) (*RoleDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
return s.repo.FindByID(id)
return s.repo.FindByID(ctx, id)
}
func (s *Service) Create(req CreateRoleRequest) (*RoleDTO, error) {
func (s *Service) Create(ctx context.Context, req CreateRoleRequest) (*RoleDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
if req.Code == "" || req.Name == "" {
return nil, errors.New("code and name are required")
}
return s.repo.Create(req)
return s.repo.Create(ctx, req)
}
func (s *Service) Update(id uint64, req UpdateRoleRequest) (*RoleDTO, error) {
func (s *Service) Update(ctx context.Context, id uint64, req UpdateRoleRequest) (*RoleDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
return s.repo.Update(id, req)
return s.repo.Update(ctx, id, req)
}
func (s *Service) Delete(id uint64) error {
func (s *Service) Delete(ctx context.Context, id uint64) error {
if s.repo == nil {
return ErrDependencyUnavailable
}
return s.repo.Delete(id)
return s.repo.Delete(ctx, id)
}
func (s *Service) AssignPermissions(roleID uint64, req AssignPermissionsRequest) error {
func (s *Service) AssignPermissions(ctx context.Context, roleID uint64, req AssignPermissionsRequest) error {
if s.repo == nil {
return ErrDependencyUnavailable
}
return s.repo.AssignPermissions(roleID, req.PermissionIDs)
return s.repo.AssignPermissions(ctx, roleID, req.PermissionIDs)
}
func (s *Service) ListPermissions() ([]PermissionDTO, error) {
func (s *Service) ListPermissions(ctx context.Context) ([]PermissionDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
return s.repo.ListPermissions()
return s.repo.ListPermissions(ctx)
}