This commit is contained in:
2025-12-09 18:55:28 +08:00
parent 8d00d67540
commit c23ab8338b
209 changed files with 5445 additions and 3963 deletions

View File

@@ -1,15 +1,16 @@
package admin_role_api
import (
"context"
"context"
"ycc-server/app/main/api/internal/svc"
"ycc-server/app/main/api/internal/types"
"ycc-server/app/main/model"
"ycc-server/common/xerr"
"ycc-server/app/main/api/internal/svc"
"ycc-server/app/main/api/internal/types"
"ycc-server/app/main/model"
"ycc-server/common/xerr"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/logx"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/logx"
"github.com/google/uuid"
)
type AdminAssignRoleApiLogic struct {
@@ -28,9 +29,9 @@ func NewAdminAssignRoleApiLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *AdminAssignRoleApiLogic) AdminAssignRoleApi(req *types.AdminAssignRoleApiReq) (resp *types.AdminAssignRoleApiResp, err error) {
// 1. 参数验证
if req.RoleId <= 0 {
if req.RoleId == "" {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.PARAM_VERIFICATION_ERROR),
"角色ID必须大于0, roleId: %d", req.RoleId)
"角色ID不能为空, roleId: %s", req.RoleId)
}
if len(req.ApiIds) == 0 {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.PARAM_VERIFICATION_ERROR),
@@ -51,7 +52,7 @@ func (l *AdminAssignRoleApiLogic) AdminAssignRoleApi(req *types.AdminAssignRoleA
// 3. 批量分配API权限
successCount := 0
for _, apiId := range req.ApiIds {
if apiId <= 0 {
if apiId == "" {
continue
}
@@ -59,10 +60,10 @@ func (l *AdminAssignRoleApiLogic) AdminAssignRoleApi(req *types.AdminAssignRoleA
_, err := l.svcCtx.AdminApiModel.FindOne(l.ctx, apiId)
if err != nil {
if errors.Is(err, model.ErrNotFound) {
logx.Errorf("API不存在, apiId: %d", apiId)
logx.Errorf("API不存在, apiId: %s", apiId)
continue
}
logx.Errorf("查询API失败, err: %v, apiId: %d", err, apiId)
logx.Errorf("查询API失败, err: %v, apiId: %s", err, apiId)
continue
}
@@ -77,10 +78,11 @@ func (l *AdminAssignRoleApiLogic) AdminAssignRoleApi(req *types.AdminAssignRoleA
}
// 创建关联
roleApiData := &model.AdminRoleApi{
RoleId: req.RoleId,
ApiId: apiId,
}
roleApiData := &model.AdminRoleApi{
Id: uuid.NewString(),
RoleId: req.RoleId,
ApiId: apiId,
}
_, err = l.svcCtx.AdminRoleApiModel.Insert(l.ctx, nil, roleApiData)
if err != nil {

View File

@@ -28,7 +28,7 @@ func NewAdminGetAllApiListLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *AdminGetAllApiListLogic) AdminGetAllApiList(req *types.AdminGetAllApiListReq) (resp *types.AdminGetAllApiListResp, err error) {
// 1. 构建查询条件
builder := l.svcCtx.AdminApiModel.SelectBuilder()
// 添加状态过滤
if req.Status > 0 {
builder = builder.Where("status = ?", req.Status)
@@ -45,8 +45,8 @@ func (l *AdminGetAllApiListLogic) AdminGetAllApiList(req *types.AdminGetAllApiLi
var apiList []types.AdminRoleApiInfo
for _, api := range apis {
apiList = append(apiList, types.AdminRoleApiInfo{
Id: 0, // 这里不是关联ID而是API ID
RoleId: 0, // 这里不是角色ID
Id: api.Id,
RoleId: "",
ApiId: api.Id,
ApiName: api.ApiName,
ApiCode: api.ApiCode,

View File

@@ -28,9 +28,9 @@ func NewAdminGetRoleApiListLogic(ctx context.Context, svcCtx *svc.ServiceContext
func (l *AdminGetRoleApiListLogic) AdminGetRoleApiList(req *types.AdminGetRoleApiListReq) (resp *types.AdminGetRoleApiListResp, err error) {
// 1. 参数验证
if req.RoleId <= 0 {
if req.RoleId == "" {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.PARAM_VERIFICATION_ERROR),
"角色ID必须大于0, roleId: %d", req.RoleId)
"角色ID不能为空, roleId: %s", req.RoleId)
}
// 2. 查询角色是否存在
@@ -38,7 +38,7 @@ func (l *AdminGetRoleApiListLogic) AdminGetRoleApiList(req *types.AdminGetRoleAp
if err != nil {
if errors.Is(err, model.ErrNotFound) {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR),
"角色不存在, roleId: %d", req.RoleId)
"角色不存在, roleId: %s", req.RoleId)
}
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR),
"查询角色失败, err: %v, roleId: %d", err, req.RoleId)
@@ -47,7 +47,7 @@ func (l *AdminGetRoleApiListLogic) AdminGetRoleApiList(req *types.AdminGetRoleAp
// 3. 查询角色API权限列表
builder := l.svcCtx.AdminRoleApiModel.SelectBuilder().
Where("role_id = ?", req.RoleId)
roleApis, err := l.svcCtx.AdminRoleApiModel.FindAll(l.ctx, builder, "")
if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR),

View File

@@ -28,9 +28,9 @@ func NewAdminRemoveRoleApiLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *AdminRemoveRoleApiLogic) AdminRemoveRoleApi(req *types.AdminRemoveRoleApiReq) (resp *types.AdminRemoveRoleApiResp, err error) {
// 1. 参数验证
if req.RoleId <= 0 {
if req.RoleId == "" {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.PARAM_VERIFICATION_ERROR),
"角色ID必须大于0, roleId: %d", req.RoleId)
"角色ID不能为空, roleId: %s", req.RoleId)
}
if len(req.ApiIds) == 0 {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.PARAM_VERIFICATION_ERROR),
@@ -51,7 +51,7 @@ func (l *AdminRemoveRoleApiLogic) AdminRemoveRoleApi(req *types.AdminRemoveRoleA
// 3. 批量移除API权限
successCount := 0
for _, apiId := range req.ApiIds {
if apiId <= 0 {
if apiId == "" {
continue
}
@@ -61,7 +61,7 @@ func (l *AdminRemoveRoleApiLogic) AdminRemoveRoleApi(req *types.AdminRemoveRoleA
if errors.Is(err, model.ErrNotFound) {
continue // 不存在,跳过
}
logx.Errorf("查询角色API关联失败, err: %v, roleId: %d, apiId: %d", err, req.RoleId, apiId)
logx.Errorf("查询角色API关联失败, err: %v, roleId: %s, apiId: %s", err, req.RoleId, apiId)
continue
}

View File

@@ -1,15 +1,16 @@
package admin_role_api
import (
"context"
"context"
"ycc-server/app/main/api/internal/svc"
"ycc-server/app/main/api/internal/types"
"ycc-server/app/main/model"
"ycc-server/common/xerr"
"ycc-server/app/main/api/internal/svc"
"ycc-server/app/main/api/internal/types"
"ycc-server/app/main/model"
"ycc-server/common/xerr"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/logx"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/logx"
"github.com/google/uuid"
)
type AdminUpdateRoleApiLogic struct {
@@ -28,9 +29,9 @@ func NewAdminUpdateRoleApiLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *AdminUpdateRoleApiLogic) AdminUpdateRoleApi(req *types.AdminUpdateRoleApiReq) (resp *types.AdminUpdateRoleApiResp, err error) {
// 1. 参数验证
if req.RoleId <= 0 {
if req.RoleId == "" {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.PARAM_VERIFICATION_ERROR),
"角色ID必须大于0, roleId: %d", req.RoleId)
"角色ID不能为空, roleId: %s", req.RoleId)
}
// 2. 查询角色是否存在
@@ -38,10 +39,10 @@ func (l *AdminUpdateRoleApiLogic) AdminUpdateRoleApi(req *types.AdminUpdateRoleA
if err != nil {
if errors.Is(err, model.ErrNotFound) {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR),
"角色不存在, roleId: %d", req.RoleId)
"角色不存在, roleId: %s", req.RoleId)
}
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR),
"查询角色失败, err: %v, roleId: %d", err, req.RoleId)
"查询角色失败, err: %v, roleId: %s", err, req.RoleId)
}
// 3. 删除该角色的所有API权限
@@ -63,7 +64,7 @@ func (l *AdminUpdateRoleApiLogic) AdminUpdateRoleApi(req *types.AdminUpdateRoleA
// 4. 添加新的API权限
if len(req.ApiIds) > 0 {
for _, apiId := range req.ApiIds {
if apiId <= 0 {
if apiId == "" {
continue
}
@@ -71,18 +72,19 @@ func (l *AdminUpdateRoleApiLogic) AdminUpdateRoleApi(req *types.AdminUpdateRoleA
_, err := l.svcCtx.AdminApiModel.FindOne(l.ctx, apiId)
if err != nil {
if errors.Is(err, model.ErrNotFound) {
logx.Errorf("API不存在, apiId: %d", apiId)
logx.Errorf("API不存在, apiId: %s", apiId)
continue
}
logx.Errorf("查询API失败, err: %v, apiId: %d", err, apiId)
logx.Errorf("查询API失败, err: %v, apiId: %s", err, apiId)
continue
}
// 创建新的关联
roleApiData := &model.AdminRoleApi{
RoleId: req.RoleId,
ApiId: apiId,
}
roleApiData := &model.AdminRoleApi{
Id: uuid.NewString(),
RoleId: req.RoleId,
ApiId: apiId,
}
_, err = l.svcCtx.AdminRoleApiModel.Insert(l.ctx, nil, roleApiData)
if err != nil {