| @@ -791,6 +791,8 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS | |||
| bonusMap := make(map[string]map[string]int) | |||
| if tableName == "user_business_analysis_current_year" { | |||
| bonusMap = getBonusMap() | |||
| log.Info("truncate all data from table:user_summary_current_year ") | |||
| statictisSess.Exec("TRUNCATE TABLE user_summary_current_year") | |||
| } | |||
| cond := "type != 1 and is_active=true" | |||
| count, err := sess.Where(cond).Count(new(User)) | |||
| @@ -986,41 +988,50 @@ func getIntValue(val string) int { | |||
| func getPlayARoll(bonusMap map[string]map[string]int, userName string) string { | |||
| bonusInfo := make(map[string]string) | |||
| record, ok := bonusMap[userName] | |||
| if ok { | |||
| bonusInfo["times"] = fmt.Sprint(record["times"]) | |||
| bonusInfo["total_bonus"] = fmt.Sprint(record["total_bonus"]) | |||
| bonusInfo["total_cardtime"] = fmt.Sprint(record["total_cardtime"]) | |||
| bonusInfo["total_giveup"] = fmt.Sprint(record["total_giveup"]) | |||
| bonusInfoJson, _ := json.Marshal(bonusInfo) | |||
| return string(bonusInfoJson) | |||
| } else { | |||
| return "" | |||
| } | |||
| bonusInfoJson, _ := json.Marshal(bonusInfo) | |||
| return string(bonusInfoJson) | |||
| } | |||
| func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItemMap map[string]int) string { | |||
| cloudBrainInfo := make(map[string]string) | |||
| cloudBrainInfo["create_task_num"] = fmt.Sprint(dateRecordAll.CloudBrainTaskNum) | |||
| cloudBrainInfo["debug_task_num"] = fmt.Sprint(dateRecordAll.GpuDebugJob + dateRecordAll.NpuDebugJob) | |||
| cloudBrainInfo["train_task_num"] = fmt.Sprint(dateRecordAll.GpuTrainJob + dateRecordAll.NpuTrainJob) | |||
| cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"]) | |||
| cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime) | |||
| cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5) | |||
| cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"]) | |||
| cloudBrainInfo["CloudBrainTwo"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainTwo"]) | |||
| cloudBrainInfo["C2Net"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_C2Net"]) | |||
| cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo) | |||
| return string(cloudBrainInfoJson) | |||
| if dateRecordAll.CloudBrainTaskNum > 0 { | |||
| cloudBrainInfo := make(map[string]string) | |||
| cloudBrainInfo["create_task_num"] = fmt.Sprint(dateRecordAll.CloudBrainTaskNum) | |||
| cloudBrainInfo["debug_task_num"] = fmt.Sprint(dateRecordAll.GpuDebugJob + dateRecordAll.NpuDebugJob) | |||
| cloudBrainInfo["train_task_num"] = fmt.Sprint(dateRecordAll.GpuTrainJob + dateRecordAll.NpuTrainJob) | |||
| cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"]) | |||
| cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime) | |||
| cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5) | |||
| cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"]) | |||
| cloudBrainInfo["CloudBrainTwo"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainTwo"]) | |||
| cloudBrainInfo["C2Net"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_C2Net"]) | |||
| cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo) | |||
| return string(cloudBrainInfoJson) | |||
| } else { | |||
| return "" | |||
| } | |||
| } | |||
| func getCodeInfo(dateRecordAll UserBusinessAnalysisAll) string { | |||
| codeInfo := make(map[string]string) | |||
| codeInfo["commit_count"] = fmt.Sprint(dateRecordAll.CommitCount) | |||
| codeInfo["commit_line"] = fmt.Sprint(dateRecordAll.CommitCodeSize) | |||
| if dateRecordAll.CommitCount > 0 { | |||
| codeInfo := make(map[string]string) | |||
| codeInfo["commit_count"] = fmt.Sprint(dateRecordAll.CommitCount) | |||
| codeInfo["commit_line"] = fmt.Sprint(dateRecordAll.CommitCodeSize) | |||
| codeInfoJson, _ := json.Marshal(codeInfo) | |||
| return string(codeInfoJson) | |||
| codeInfoJson, _ := json.Marshal(codeInfo) | |||
| return string(codeInfoJson) | |||
| } else { | |||
| return "" | |||
| } | |||
| } | |||
| func getDataSetInfo(userId int64, CreatedDataset map[int64]int, dataSetDownloadMap map[int64]int, CommitDatasetNumMap map[int64]int, CollectedDataset map[int64]int) string { | |||
| @@ -1037,8 +1048,12 @@ func getDataSetInfo(userId int64, CreatedDataset map[int64]int, dataSetDownloadM | |||
| if cllected_count, ok := CollectedDataset[userId]; ok { | |||
| datasetInfo["cllected_count"] = fmt.Sprint(cllected_count) | |||
| } | |||
| datasetInfoJson, _ := json.Marshal(datasetInfo) | |||
| return string(datasetInfoJson) | |||
| if len(datasetInfo) > 0 { | |||
| datasetInfoJson, _ := json.Marshal(datasetInfo) | |||
| return string(datasetInfoJson) | |||
| } else { | |||
| return "" | |||
| } | |||
| } | |||
| func getRepoDetailInfo(repoDetailInfoMap map[string]int, userId int64, mostDownload map[int64]string) string { | |||
| @@ -1061,8 +1076,12 @@ func getRepoDetailInfo(repoDetailInfoMap map[string]int, userId int64, mostDownl | |||
| if mostdownloadName, ok := mostDownload[userId]; ok { | |||
| repoDetailInfo["repo_most_download_name"] = mostdownloadName | |||
| } | |||
| repoDetailInfoJson, _ := json.Marshal(repoDetailInfo) | |||
| return string(repoDetailInfoJson) | |||
| if len(repoDetailInfo) > 0 { | |||
| repoDetailInfoJson, _ := json.Marshal(repoDetailInfo) | |||
| return string(repoDetailInfoJson) | |||
| } else { | |||
| return "" | |||
| } | |||
| } | |||
| func getMostActiveJson(userInfo map[string]int) string { | |||
| @@ -1686,7 +1705,7 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) (map[ | |||
| var indexTotal int64 | |||
| indexTotal = 0 | |||
| for { | |||
| sess.Select("id,user_id,op_type,act_user_id").Table("action").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) | |||
| sess.Select("id,user_id,op_type,act_user_id,created_unix").Table("action").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) | |||
| actionList := make([]*Action, 0) | |||
| sess.Find(&actionList) | |||