diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index e7dde9c28..dc4ce6e27 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -189,7 +189,7 @@ func GetRecordBeginTime() ([]*CloudbrainInfo, error) { sess := x.NewSession() defer sess.Close() - sess.OrderBy("cloudbrain.created_unix ASC limit 1") + sess.OrderBy("cloudbrain.id ASC limit 1") cloudbrains := make([]*CloudbrainInfo, 0) if err := sess.Table(&Cloudbrain{}).Unscoped(). Find(&cloudbrains); err != nil { diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 698b0e45e..95257fb10 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -29,15 +29,15 @@ type DateCloudbrainNum struct { } func GetAllCloudbrainsOverview(ctx *context.Context) { - 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 - } - recoreTime, err := models.GetRecordBeginTime() + // 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 + // } + recordCloudbrain, err := models.GetRecordBeginTime() if err != nil { - log.Error("Can not get record begin time", err) + log.Error("Can not get recordCloudbrain", err) ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) return } @@ -102,8 +102,7 @@ func GetAllCloudbrainsOverview(ctx *context.Context) { todayWaitingCount := todayStatusResult["INIT"] + todayStatusResult["WAITING"] ctx.JSON(http.StatusOK, map[string]interface{}{ - "recordBeginTime": recordBeginTime, - "recoreTime": recoreTime[0].Cloudbrain.CreatedUnix, + "recordBeginTime": recordCloudbrain[0].Cloudbrain.CreatedUnix, "updateTime": now, "cloudBrainNum": cloudBrainNum, "cloudBrainOneDuration": cloudBrainOneDuration, @@ -546,12 +545,14 @@ func GetCloudbrainsDetailData(ctx *context.Context) { func GetCloudbrainsCreateHoursData(ctx *context.Context) { createHourPeriodCount := make(map[string]interface{}) - recordBeginTime, err := getBrainRecordBeginTime() + recordCloudbrain, err := models.GetRecordBeginTime() if err != nil { - log.Error("Can not get brain record begin time", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.brain_record_begintime_get_err")) + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) return } + recordTime := time.Unix(int64(recordCloudbrain[0].Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT) + recordBeginTime, _ := time.Parse("2006-01-02 15:04:05", recordTime) now := time.Now() queryType := ctx.QueryTrim("type") beginTimeStr := ctx.QueryTrim("beginTime") @@ -630,7 +631,7 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) { return } ctx.JSON(http.StatusOK, map[string]interface{}{ - "recordBeginTime": recordBeginTime, + "recordBeginTime": recordCloudbrain[0].Cloudbrain.CreatedUnix, "updateTime": now, "createHourPeriodCount": createHourPeriodCount, "runHourPeriodCount": runHourPeriodCount,