shanshanzhong
41423ca666
修复订阅列表查询中服务器组为空时的处理逻辑，避免潜在错误 在getSubscribeListLogic.go中添加服务器数量统计功能 更新Dockerfile添加logs目录拷贝 清理ppanel.yaml配置文件中的合并冲突和冗余配置
70 lines
1.9 KiB
Go
70 lines
1.9 KiB
Go
package subscribe
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
|
|
"github.com/perfect-panel/server/internal/svc"
|
|
"github.com/perfect-panel/server/internal/types"
|
|
"github.com/perfect-panel/server/pkg/logger"
|
|
"github.com/perfect-panel/server/pkg/tool"
|
|
"github.com/perfect-panel/server/pkg/xerr"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
type QuerySubscribeListLogic struct {
|
|
logger.Logger
|
|
ctx context.Context
|
|
svcCtx *svc.ServiceContext
|
|
}
|
|
|
|
// Get subscribe list
|
|
func NewQuerySubscribeListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *QuerySubscribeListLogic {
|
|
return &QuerySubscribeListLogic{
|
|
Logger: logger.WithContext(ctx),
|
|
ctx: ctx,
|
|
svcCtx: svcCtx,
|
|
}
|
|
}
|
|
|
|
func (l *QuerySubscribeListLogic) QuerySubscribeList() (resp *types.QuerySubscribeListResponse, err error) {
|
|
|
|
data, err := l.svcCtx.SubscribeModel.QuerySubscribeList(l.ctx)
|
|
if err != nil {
|
|
l.Errorw("[QuerySubscribeListLogic] Database Error", logger.Field("error", err.Error()))
|
|
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QuerySubscribeList error: %v", err.Error())
|
|
}
|
|
resp = &types.QuerySubscribeListResponse{
|
|
Total: int64(len(data)),
|
|
}
|
|
list := make([]types.Subscribe, len(data))
|
|
for i, item := range data {
|
|
var sub types.Subscribe
|
|
|
|
tool.DeepCopy(&sub, item)
|
|
if item.Discount != "" {
|
|
var discount []types.SubscribeDiscount
|
|
_ = json.Unmarshal([]byte(item.Discount), &discount)
|
|
sub.Discount = discount
|
|
list[i] = sub
|
|
}
|
|
list[i] = sub
|
|
// 通过服务组查询关联的节点数量
|
|
if item.ServerGroup != "" {
|
|
groupIds := tool.StringToInt64Slice(item.ServerGroup)
|
|
servers, err := l.svcCtx.ServerModel.FindServerListByGroupIds(l.ctx, groupIds)
|
|
if err != nil {
|
|
l.Errorw("[QuerySubscribeListLogic] FindServerListByGroupIds error", logger.Field("error", err.Error()))
|
|
sub.ServerCount = 0
|
|
} else {
|
|
sub.ServerCount = int64(len(servers))
|
|
}
|
|
} else {
|
|
sub.ServerCount = 0
|
|
}
|
|
list[i] = sub
|
|
}
|
|
resp.List = list
|
|
return
|
|
}
|