From c485ca0331814aedb0d24990c39671ecf8bcec0d Mon Sep 17 00:00:00 2001 From: liuzx Date: Sat, 2 Apr 2022 10:56:10 +0800 Subject: [PATCH] update --- models/cloudbrain.go | 13 ------------- routers/user/home.go | 21 +-------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index b12ac85ff..725686482 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1565,16 +1565,3 @@ func RestartCloudbrain(old *Cloudbrain, new *Cloudbrain) (err error) { return nil } -func GetUserCloudbrainCount(UserID int64) (int64, error) { - countSql := "SELECT count(*) FROM " + - "public.cloudbrain where user_id ='" + strconv.FormatInt(UserID, 10) + "'" - return x.SQL(countSql).Count() -} -func GetUserCloudbrainDuration(UserID int64, CloudbrainType int) (string, error) { - total, err := x.Unscoped().Where("user_id = ? And type = ? ", UserID, CloudbrainType).SumInt(&Cloudbrain{}, "duration") - if err != nil { - return "get total error", err - } - - return ConvertDurationToStr(total), nil -} diff --git a/routers/user/home.go b/routers/user/home.go index 9250670c8..2d1add0a1 100755 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -831,30 +831,11 @@ func Cloudbrains(ctx *context.Context) { pager.SetDefaultParams(ctx) pager.AddParam(ctx, "listType", "ListType") ctx.Data["Page"] = pager - ctx.Data["PageIsCloudBrain"] = true + ctx.Data["PageIsUserCloudBrain"] = true ctx.Data["Tasks"] = ciTasks ctx.Data["CanCreate"] = true ctx.Data["Keyword"] = keyword - userCloudbrainCount, err := models.GetUserCloudbrainCount(ctxUser.ID) - if err != nil { - ctx.ServerError("GetUserCloudbrainCount failed:", err) - return - } - cloudbrainOneDuration, err := models.GetUserCloudbrainDuration(ctxUser.ID, models.TypeCloudBrainOne) - if err != nil { - ctx.ServerError("GetUserCloudbrainOneDuration failed:", err) - return - } - cloudbrainTwoDuration, err := models.GetUserCloudbrainDuration(ctxUser.ID, models.TypeCloudBrainTwo) - if err != nil { - ctx.ServerError("GetUserCloudbrainTwoDuration failed:", err) - return - } - ctx.Data["UserCloudbrainCount"] = userCloudbrainCount - ctx.Data["cloudbrainOneDuration"] = cloudbrainOneDuration - ctx.Data["cloudbrainTwoDuration"] = cloudbrainTwoDuration - ctx.HTML(200, tplCloudbrains) }