#5142 【数字版本】云脑任务详情列表增加“资源池(队列)”列 enhancement

Merged
ychao_1983 merged 2 commits from kanban-fix-117 into V20240129 3 months ago
  1. +4
    -0
      models/cloudbrain.go
  2. +2
    -0
      models/cloudbrain_spec.go
  3. +2
    -0
      routers/api/v1/repo/cloudbrain_dashboard.go

+ 4
- 0
models/cloudbrain.go View File

@@ -778,6 +778,7 @@ type CloudbrainsOptions struct {
AccCardType string
AccCardsNum int
WorkServerNumber int
QueueId int64
}

type TaskPod struct {
@@ -3054,6 +3055,9 @@ func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
if opts.AccCardsNum >= 0 {
cond = cond.And(builder.Eq{"cloudbrain_spec.acc_cards_num": opts.AccCardsNum})
}
if opts.QueueId > 0 {
cond = cond.And(builder.Eq{"cloudbrain_spec.queue_id": opts.QueueId})
}

var count int64
var err error


+ 2
- 0
models/cloudbrain_spec.go View File

@@ -44,6 +44,8 @@ func (s CloudbrainSpec) ConvertToSpecification() *Specification {
UnitPrice: s.UnitPrice,
QueueId: s.QueueId,
QueueCode: s.QueueCode,
QueueName: s.QueueName,
QueueType: s.QueueType,
Cluster: s.Cluster,
AiCenterCode: s.AiCenterCode,
AiCenterName: s.AiCenterName,


+ 2
- 0
routers/api/v1/repo/cloudbrain_dashboard.go View File

@@ -804,6 +804,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
workServerNumber := ctx.QueryInt("workServerNumber")
beginTimeStr := ctx.QueryTrim("beginTime")
endTimeStr := ctx.QueryTrim("endTime")
queueId := ctx.QueryInt64("queueId")
var beginTimeUnix int64
var endTimeUnix int64
if beginTimeStr == "" || endTimeStr == "" {
@@ -899,6 +900,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
AccCardType: accCardType,
AccCardsNum: accCardsNum,
WorkServerNumber: workServerNumber,
QueueId: queueId,
})
if err != nil {
ctx.ServerError("Get job failed:", err)


Loading…
Cancel
Save