fix-3319

models/cloudbrain.go

@@ -204,7 +204,7 @@ type Cloudbrain struct {
 	BenchmarkTypeRankLink string      `xorm:"-"`
 	StartTime             timeutil.TimeStamp
 	EndTime               timeutil.TimeStamp
-	Cleared               bool   `xorm:"DEFAULT false"`
+	Cleared               bool           `xorm:"DEFAULT false"`
 	Spec                  *Specification `xorm:"-"`
 }
 
@@ -442,29 +442,32 @@ type GetImagesPayload struct {
 
 type CloudbrainsOptions struct {
 	ListOptions
-	RepoID          int64 // include all repos if empty
-	UserID          int64
-	JobID           string
-	SortType        string
-	CloudbrainIDs   []int64
-	JobStatus       []string
-	JobStatusNot    bool
-	Keyword         string
-	Type            int
-	JobTypes        []string
-	VersionName     string
-	IsLatestVersion string
-	JobTypeNot      bool
-	NeedRepoInfo    bool
-	RepoIDList      []int64
-	BeginTime       time.Time
-	EndTime         time.Time
-	ComputeResource string
-	BeginTimeUnix   int64
-	EndTimeUnix     int64
-	AiCenter        string
-	NeedDeleteInfo  string
-	Cluster         string
+	RepoID           int64 // include all repos if empty
+	UserID           int64
+	JobID            string
+	SortType         string
+	CloudbrainIDs    []int64
+	JobStatus        []string
+	JobStatusNot     bool
+	Keyword          string
+	Type             int
+	JobTypes         []string
+	VersionName      string
+	IsLatestVersion  string
+	JobTypeNot       bool
+	NeedRepoInfo     bool
+	RepoIDList       []int64
+	BeginTime        time.Time
+	EndTime          time.Time
+	ComputeResource  string
+	BeginTimeUnix    int64
+	EndTimeUnix      int64
+	AiCenter         string
+	NeedDeleteInfo   string
+	Cluster          string
+	AccCardType      string
+	AccCardsNum      string
+	WorkServerNumber int
 }
 
 type TaskPod struct {
@@ -1906,7 +1909,7 @@ func GetCloudbrainByID(id string) (*Cloudbrain, error) {
 	return getRepoCloudBrain(cb)
 }
 
-func IsCloudbrainExistByJobName(jobName string)(bool,error){
+func IsCloudbrainExistByJobName(jobName string) (bool, error) {
 	return x.Unscoped().Exist(&Cloudbrain{
 		JobName: jobName,
 	})
@@ -2070,25 +2073,25 @@ func GetCloudBrainOneStoppedNotDebugJobDaysAgo(days int, limit int) ([]*Cloudbra
 		Limit(limit).
 		Find(&cloudbrains)
 }
+
 /**
   本方法考虑了再次调试的情况，多次调试取最后一次的任务的结束时间
- */
+*/
 func GetCloudBrainOneStoppedDebugJobDaysAgo(days int, limit int) ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0, 10)
 	endTimeBefore := time.Now().Unix() - int64(days)*24*3600
 	missEndTimeBefore := endTimeBefore - 24*3600
-    sql:=`SELECT id,job_name,job_id from (SELECT DISTINCT ON (job_name)
+	sql := `SELECT id,job_name,job_id from (SELECT DISTINCT ON (job_name)
         id, job_name, job_id,status,end_time,updated_unix,cleared
         FROM   cloudbrain
         where type=0 and job_type='DEBUG'
         ORDER  BY job_name, updated_unix DESC) a
         where status in ('STOPPED','SUCCEEDED','FAILED') and (((end_time is null or end_time=0) and updated_unix<? and updated_unix != 0 ) or (end_time<? and end_time != 0)) and cleared=false`
 
-	return cloudbrains, x.Unscoped().SQL(sql,missEndTimeBefore, endTimeBefore).Limit(limit).Find(&cloudbrains)
+	return cloudbrains, x.Unscoped().SQL(sql, missEndTimeBefore, endTimeBefore).Limit(limit).Find(&cloudbrains)
 
 }
 
-
 func UpdateCloudBrainRecordsCleared(ids []int64) error {
 	pageSize := 150
 	n := len(ids) / pageSize
@@ -2321,18 +2324,37 @@ func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
 		)
 	}
 
+	if opts.WorkServerNumber > 0 {
+		cond = cond.And(
+			builder.Eq{"COALESCE(cloudbrain.work_server_number, 1)": opts.WorkServerNumber},
+		)
+	}
+
+	// 如果opts中包含了cardtype，那么添加查询条件
+	if opts.AccCardType != "" {
+		cond = cond.And(builder.Eq{"cloudbrain_spec.acc_card_type": opts.AccCardType})
+	}
+	if opts.AccCardsNum != "" {
+		cond = cond.And(builder.Eq{"cloudbrain_spec.acc_cards_num": opts.AccCardsNum})
+	}
+
 	var count int64
 	var err error
 	condition := "cloudbrain.user_id = `user`.id"
 	if len(opts.Keyword) == 0 {
-		count, err = sess.Unscoped().Where(cond).Count(new(Cloudbrain))
+		count, err = sess.Table(&Cloudbrain{}).Unscoped().Where(cond).
+			Join("left", "`user`", condition).
+			Join("left", "cloudbrain_spec", "cloudbrain.id = cloudbrain_spec.cloudbrain_id").
+			Count(new(CloudbrainInfo))
 	} else {
 		lowerKeyWord := strings.ToLower(opts.Keyword)
 
 		cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord},
 			builder.Like{"LOWER(cloudbrain.display_job_name)", lowerKeyWord}, builder.Like{"`user`.lower_name", lowerKeyWord}))
 		count, err = sess.Table(&Cloudbrain{}).Unscoped().Where(cond).
-			Join("left", "`user`", condition).Count(new(CloudbrainInfo))
+			Join("left", "`user`", condition).
+			Join("left", "cloudbrain_spec", "cloudbrain.id = cloudbrain_spec.cloudbrain_id").
+			Count(new(CloudbrainInfo))
 
 	}
 
@@ -2354,6 +2376,7 @@ func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
 	cloudbrains := make([]*CloudbrainInfo, 0, setting.UI.IssuePagingNum)
 	if err := sess.Table(&Cloudbrain{}).Unscoped().Where(cond).
 		Join("left", "`user`", condition).
+		Join("left", "cloudbrain_spec", "cloudbrain.id = cloudbrain_spec.cloudbrain_id").
 		Find(&cloudbrains); err != nil {
 		return nil, 0, fmt.Errorf("Find: %v", err)
 	}

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -719,6 +719,11 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 	aiCenter := ctx.Query("aiCenter")
 	needDeleteInfo := ctx.Query("needDeleteInfo")
 
+	accCardType := ctx.Query("accCardType")
+	accCardsNum := ctx.Query("accCardsNum")
+	workServerNumber := ctx.QueryInt("workServerNumber")
+	workServerNumber = 0
+
 	if cloudBrainType == models.TypeCloudBrainOne && aiCenter == models.AICenterOfCloudBrainOne {
 		aiCenter = ""
 	}
@@ -777,18 +782,21 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 			Page:     page,
 			PageSize: pageSize,
 		},
-		Keyword:         keyword,
-		Type:            cloudBrainType,
-		ComputeResource: listType,
-		JobTypeNot:      jobTypeNot,
-		JobStatusNot:    jobStatusNot,
-		JobStatus:       jobStatuses,
-		JobTypes:        jobTypes,
-		NeedRepoInfo:    true,
-		BeginTimeUnix:   int64(recordBeginTime),
-		EndTimeUnix:     endTime.Unix(),
-		AiCenter:        aiCenter,
-		NeedDeleteInfo:  needDeleteInfo,
+		Keyword:          keyword,
+		Type:             cloudBrainType,
+		ComputeResource:  listType,
+		JobTypeNot:       jobTypeNot,
+		JobStatusNot:     jobStatusNot,
+		JobStatus:        jobStatuses,
+		JobTypes:         jobTypes,
+		NeedRepoInfo:     true,
+		BeginTimeUnix:    int64(recordBeginTime),
+		EndTimeUnix:      endTime.Unix(),
+		AiCenter:         aiCenter,
+		NeedDeleteInfo:   needDeleteInfo,
+		AccCardType:      accCardType,
+		AccCardsNum:      accCardsNum,
+		WorkServerNumber: workServerNumber,
 	})
 	if err != nil {
 		ctx.ServerError("Get job failed:", err)