diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 74fde12f6..e505310a5 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -99,6 +99,7 @@ func GetAllCloudbrainsOverview(ctx *context.Context) { ctx.JSON(http.StatusOK, map[string]interface{}{ // "todayStatusResult": todayStatusResult, "recordBeginTime": recordBeginTime, + "updateTime": now, "cloudBrainNum": cloudBrainNum, "cloudBrainOneDuration": cloudBrainOneDuration, "cloudBrainTwoDuration": cloudBrainTwoDuration, @@ -560,12 +561,13 @@ func GetCloudbrainsDetailData(ctx *context.Context) { func GetCloudbrainsCreateHoursData(ctx *context.Context) { createHourPeriodCount := make(map[string]interface{}) - brainRecordBeginTime, err := getBrainRecordBeginTime() + recordBeginTime, err := getBrainRecordBeginTime() 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")) return } + now := time.Now() queryType := ctx.QueryTrim("type") beginTimeStr := ctx.QueryTrim("beginTime") endTimeStr := ctx.QueryTrim("endTime") @@ -574,7 +576,7 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) { var endTime time.Time if queryType != "" { if queryType == "all" { - beginTime = brainRecordBeginTime + beginTime = recordBeginTime endTime = now } else if queryType == "today" { beginTime = now.AddDate(0, 0, 0) @@ -611,7 +613,7 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) { } else { if beginTimeStr == "" || endTimeStr == "" { //如果查询类型和开始时间结束时间都未设置,按queryType=all处理 - beginTime = brainRecordBeginTime + beginTime = recordBeginTime endTime = now } else { beginTime, err = time.ParseInLocation("2006-01-02", beginTimeStr, time.Local) @@ -644,6 +646,8 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) { return } ctx.JSON(http.StatusOK, map[string]interface{}{ + "recordBeginTime": recordBeginTime, + "updateTime": now, "createHourPeriodCount": createHourPeriodCount, "runHourPeriodCount": runHourPeriodCount, })