From dda57af14e1a38ce88545d72ec132af2d1a49e17 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 18 Jan 2023 10:41:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3Bug=20#3257?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 30 +++++++++++++++--------------- options/locale/locale_en-US.ini | 2 +- web_src/vuepages/langs/config/en-US.js | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 11f6d9d01..b01080cc6 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -846,13 +846,17 @@ func RefreshUserYearTable(pageStartTime time.Time, pageEndTime time.Time) { scoreMap["codescore"] = codescore cloudBrainInfo := getCloudBrainInfo(&dateRecordAll, CloudBrainTaskItemMap, scoreMap) playARoll := getPlayARoll(bonusMap, dateRecordAll.Name, scoreMap) + exteral := 0 + if int(subTime.Hours())%24 > 0 { + exteral = 1 + } re := &UserSummaryCurrentYear{ ID: dateRecordAll.ID, Name: dateRecordAll.Name, Email: dateRecordAll.Email, Phone: dateRecordAll.Phone, RegistDate: dateRecordAll.RegistDate, - DateCount: int(subTime.Hours()) / 24, + DateCount: int(subTime.Hours())/24 + exteral, MostActiveDay: mostActiveDay, RepoInfo: repoInfo, DataSetInfo: dataSetInfo, @@ -870,17 +874,6 @@ func RefreshUserYearTable(pageStartTime time.Time, pageEndTime time.Time) { log.Info("update user year data finished. ") } -func isUserYearData(tableName string) bool { - if tableName == "user_business_analysis_current_year" { - currentTimeNow := time.Now() - if currentTimeNow.Year() >= 2023 { - return false - } - return true - } - return false -} - func getBonusWeekDataMap() map[int64][]int { bonusMap := make(map[int64][]int) url := setting.RecommentRepoAddr + "bonus/weekdata/record.txt" @@ -2307,7 +2300,7 @@ func queryUserCreateRepo(start_unix int64, end_unix int64) (map[int64]int, map[s var indexTotal int64 indexTotal = 0 for { - sess.Select("id,owner_id,name,is_private,clone_cnt").Table("repository").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) + sess.Select("id,owner_id,name,is_private,clone_cnt,alias").Table("repository").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) repoList := make([]*Repository, 0) sess.Find(&repoList) log.Info("query Repository size=" + fmt.Sprint(len(repoList))) @@ -2530,6 +2523,13 @@ func queryUserModelConvert(start_unix int64, end_unix int64) map[int64]int { return resultMap } +func isBenchMark(JobType string) bool { + if JobType == "BENCHMARK" || JobType == "MODELSAFETY" || JobType == "SNN4IMAGENET" || JobType == "BRAINSCORE" || JobType == "SNN4ECOSET" { + return true + } + return false +} + func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[string]int) { sess := x.NewSession() defer sess.Close() @@ -2565,7 +2565,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s setMapKey("NpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap) } else if cloudTaskRecord.JobType == "INFERENCE" { setMapKey("NpuInferenceJob", cloudTaskRecord.UserID, 1, resultItemMap) - } else if cloudTaskRecord.JobType == "BENCHMARK" || cloudTaskRecord.JobType == "MODELSAFETY" { + } else if isBenchMark(cloudTaskRecord.JobType) { setMapKey("GpuBenchMarkJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("NpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) @@ -2576,7 +2576,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap) } else if cloudTaskRecord.JobType == "INFERENCE" { setMapKey("GpuInferenceJob", cloudTaskRecord.UserID, 1, resultItemMap) - } else if cloudTaskRecord.JobType == "BENCHMARK" || cloudTaskRecord.JobType == "MODELSAFETY" { + } else if isBenchMark(cloudTaskRecord.JobType) { setMapKey("GpuBenchMarkJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ecd2598b7..1044876d7 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1174,7 +1174,7 @@ modelarts.train_job.new_train=New Train Task modelarts.train_job.new_infer=New Inference Task modelarts.train_job.config=Configuration information modelarts.train_job.new=New train Task -modelarts.train_job.new_place=The description should not exceed 256 characters +modelarts.train_job.new_place=The description should not exceed 255 characters modelarts.model_name=Model Name modelarts.model_size=Model Size modelarts.import_model=Import Model diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js index 7e6dc25bc..81e9bf50b 100644 --- a/web_src/vuepages/langs/config/en-US.js +++ b/web_src/vuepages/langs/config/en-US.js @@ -239,7 +239,7 @@ const en = { modelLabel: 'Model label', modelLabelInputTips: 'Input labels, multiple labels are separated by spaces', modelDescr: 'Model description', - modelDescrInputTips: 'The description should not exceed 256 characters', + modelDescrInputTips: 'The description should not exceed 255 characters', confirm: 'Confirm', cancel: 'Cancel', modelCreateFailed: 'Model create failed',