update

models/cloudbrain_static.go

@@ -12,6 +12,7 @@ import (
 
 type TaskDetail struct {
 	ID              int64              `json:"ID"`
+	JobID           string             `json:"JobID"`
 	JobName         string             `json:"JobName"`
 	DisplayJobName  string             `json:"DisplayJobName"`
 	Status          string             `json:"Status"`
@@ -205,7 +206,7 @@ func GetWaittingTop() ([]*CloudbrainInfo, error) {
 	defer sess.Close()
 	var cond = builder.NewCond()
 	cond = cond.And(
-		builder.Eq{"cloudbrain.status": "WAITING"},
+		builder.Eq{"cloudbrain.status": string(JobWaiting)},
 	)
 	sess.OrderBy("(cloudbrain.start_time-cloudbrain.created_unix) DESC limit 10")
 	cloudbrains := make([]*CloudbrainInfo, 0, 10)
@@ -220,7 +221,7 @@ func GetRunningTop() ([]*CloudbrainInfo, error) {
 	defer sess.Close()
 	var cond = builder.NewCond()
 	cond = cond.And(
-		builder.Eq{"cloudbrain.status": "RUNNING"},
+		builder.Eq{"cloudbrain.status": string(JobRunning)},
 	)
 	sess.OrderBy("(cloudbrain.end_time-cloudbrain.start_time) DESC limit 10")
 	cloudbrains := make([]*CloudbrainInfo, 0, 10)

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -9,7 +9,6 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/modelarts"
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 
 	"code.gitea.io/gitea/modules/setting"
@@ -358,18 +357,14 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 	}
 	recordTime := time.Unix(int64(recordCloudbrain[0].Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT)
 	recordBeginTime, _ := time.Parse("2006-01-02 15:04:05", recordTime)
-	// recordBeginTime, err := getBrainRecordBeginTime()
-	// if err != nil {
-	// 	log.Error("Can not get record begin time", err)
-	// 	ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
-	// 	return
-	// }
 	beginTime, endTime, err := getTimePeroid(ctx, recordBeginTime)
 	if err != nil {
 		log.Error("Parameter is wrong", err)
 		ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong"))
 		return
 	}
+	// beginTime = beginTime.AddDate(0, 0, -1)
+	// endTime = endTime.AddDate(0, 0, -1)
 
 	cloudbrains, err := models.GetAllCloudBrain()
 	if err != nil {
@@ -527,7 +522,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 		JobStatus:       jobStatuses,
 		JobTypes:        jobTypes,
 		NeedRepoInfo:    true,
-		IsLatestVersion: modelarts.IsLatestVersion,
+		// IsLatestVersion: modelarts.IsLatestVersion,
 	})
 	if err != nil {
 		ctx.ServerError("Get job failed:", err)
@@ -558,6 +553,9 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 		if taskDetail.WaitTime < 0 {
 			taskDetail.WaitTime = 0
 		}
+		if ciTasks[i].Cloudbrain.Type == models.TypeCloudBrainTwo {
+			taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
+		}
 		tasks = append(tasks, taskDetail)
 	}
 

routers/api/v1/repo/repo_dashbord.go

@@ -192,7 +192,6 @@ func GetProjectsSummaryData(ctx *context.Context) {
 
 	}
 
-
 	projectSummaryPeriodData := ProjectSummaryPeriodData{
 		TotalCount:      count - 1,
 		RecordBeginTime: recordBeginTime.Format(DATE_FORMAT),
@@ -203,7 +202,7 @@ func GetProjectsSummaryData(ctx *context.Context) {
 
 }
 
-func reverse(datas []*ProjectSummaryBaseData ) []*ProjectSummaryBaseData {
+func reverse(datas []*ProjectSummaryBaseData) []*ProjectSummaryBaseData {
 	for i := 0; i < len(datas)/2; i++ {
 		j := len(datas) - i - 1
 		datas[i], datas[j] = datas[j], datas[i]
@@ -211,8 +210,6 @@ func reverse(datas []*ProjectSummaryBaseData ) []*ProjectSummaryBaseData {
 	return datas
 }
 
-
-
 func setStatisticsData(data *ProjectSummaryBaseData, v *models.SummaryStatistic, stats *models.SummaryStatistic) {
 	data.NumReposAdd = v.NumRepos - stats.NumRepos
 	data.NumRepoPublicAdd = v.NumRepoPublic - stats.NumRepoPublic