Merge pull request '用户年度统计报告调整。' (#3403) from zouap_static into V20221214

Reviewed-on: https://openi.pcl.ac.cn/OpenI/aiforge/pulls/3403
Reviewed-by: ychao_1983 <ychao_1983@sina.com>

models/user_business_analysis.go

@@ -355,6 +355,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 	OpenIIndexMap := queryUserRepoOpenIIndex(start_unix, end_unix)
 	CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix)
 	AiModelManageMap := queryUserModel(start_unix, end_unix)
+	AiModelConvertMap := queryUserModelConvert(start_unix, end_unix)
 
 	CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix)
 	RecommendDataset, _ := queryRecommedDataSet(start_unix, end_unix)
@@ -427,6 +428,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 			dateRecord.GpuBenchMarkJob = getMapKeyStringValue(fmt.Sprint(dateRecord.ID)+"_GpuBenchMarkJob", CloudBrainTaskItemMap)
 			dateRecord.CloudBrainRunTime = getMapKeyStringValue(fmt.Sprint(dateRecord.ID)+"_CloudBrainRunTime", CloudBrainTaskItemMap)
 			dateRecord.CommitModelCount = getMapValue(dateRecord.ID, AiModelManageMap)
+			dateRecord.ModelConvertCount = getMapValue(dateRecord.ID, AiModelConvertMap)
 
 			dateRecord.CollectDataset = getMapValue(dateRecord.ID, CollectDataset)
 			dateRecord.CollectedDataset = getMapValue(dateRecord.ID, CollectedDataset)
@@ -546,6 +548,7 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus
 					resultMap[userRecord.ID].CommitDatasetSize += userRecord.CommitDatasetSize
 					resultMap[userRecord.ID].CommitDatasetNum += userRecord.CommitDatasetNum
 					resultMap[userRecord.ID].CommitModelCount += userRecord.CommitModelCount
+					resultMap[userRecord.ID].ModelConvertCount += userRecord.ModelConvertCount
 					resultMap[userRecord.ID].SolveIssueCount += userRecord.SolveIssueCount
 					resultMap[userRecord.ID].EncyclopediasCount += userRecord.EncyclopediasCount
 					resultMap[userRecord.ID].CreateRepoCount += userRecord.CreateRepoCount
@@ -583,7 +586,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	startTime := currentTimeNow.AddDate(0, 0, -1)
 
 	CodeMergeCountMap := queryPullRequest(start_unix, end_unix)
-	CommitCountMap, mostActiveMap := queryCommitAction(start_unix, end_unix, 5)
+	CommitCountMap, _ := queryCommitAction(start_unix, end_unix, 5)
 	IssueCountMap := queryCreateIssue(start_unix, end_unix)
 
 	CommentCountMap := queryComment(start_unix, end_unix)
@@ -599,29 +602,25 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 		//log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson))
 	}
 	//CommitCodeSizeMap := queryCommitCodeSize(StartTimeNextDay.Unix(), EndTimeNextDay.Unix())
-	CommitDatasetSizeMap, CommitDatasetNumMap, dataSetDownloadMap := queryDatasetSize(start_unix, end_unix)
+	CommitDatasetSizeMap, CommitDatasetNumMap, _ := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
-	CreateRepoCountMap, DetailInfoMap, MostDownloadMap := queryUserCreateRepo(start_unix, end_unix)
+	CreateRepoCountMap, _, _ := queryUserCreateRepo(start_unix, end_unix)
 	LoginCountMap := queryLoginCount(start_unix, end_unix)
 
 	OpenIIndexMap := queryUserRepoOpenIIndex(startTime.Unix(), end_unix)
 	CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix)
 	AiModelManageMap := queryUserModel(start_unix, end_unix)
+	AiModelConvertMap := queryUserModelConvert(start_unix, end_unix)
 
 	CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix)
-	RecommendDataset, CreatedDataset := queryRecommedDataSet(start_unix, end_unix)
+	RecommendDataset, _ := queryRecommedDataSet(start_unix, end_unix)
 	CollectImage, CollectedImage := queryImageStars(start_unix, end_unix)
 	RecommendImage := queryRecommedImage(start_unix, end_unix)
 
 	InvitationMap := queryUserInvitationCount(start_unix, end_unix)
 
 	DataDate := currentTimeNow.Format("2006-01-02") + " 00:01"
-	bonusMap := make(map[string]map[string]int)
-	if isUserYearData(tableName) {
-		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))
 	if err != nil {
@@ -687,6 +686,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 			dateRecordAll.GpuBenchMarkJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_GpuBenchMarkJob", CloudBrainTaskItemMap)
 			dateRecordAll.CloudBrainRunTime = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_CloudBrainRunTime", CloudBrainTaskItemMap)
 			dateRecordAll.CommitModelCount = getMapValue(dateRecordAll.ID, AiModelManageMap)
+			dateRecordAll.ModelConvertCount = getMapValue(dateRecordAll.ID, AiModelConvertMap)
 			dateRecordAll.CollectDataset = getMapValue(dateRecordAll.ID, CollectDataset)
 			dateRecordAll.CollectedDataset = getMapValue(dateRecordAll.ID, CollectedDataset)
 			dateRecordAll.RecommendDataset = getMapValue(dateRecordAll.ID, RecommendDataset)
@@ -719,37 +719,6 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 					userMetrics["TotalHasActivityUser"] = getMapKeyStringValue("TotalHasActivityUser", userMetrics) + 1
 				}
 			}
-			if isUserYearData(tableName) {
-				//年度数据
-				subTime := time.Now().UTC().Sub(dateRecordAll.RegistDate.AsTime().UTC())
-				mostActiveDay := ""
-				if userInfo, ok := mostActiveMap[dateRecordAll.ID]; ok {
-					mostActiveDay = getMostActiveJson(userInfo)
-				}
-				scoreMap := make(map[string]float64)
-				repoInfo := getRepoDetailInfo(DetailInfoMap, dateRecordAll.ID, MostDownloadMap)
-				dataSetInfo, datasetscore := getDataSetInfo(dateRecordAll.ID, CreatedDataset, dataSetDownloadMap, CommitDatasetNumMap, CollectedDataset)
-				scoreMap["datasetscore"] = datasetscore
-				codeInfo, codescore := getCodeInfo(dateRecordAll)
-				scoreMap["codescore"] = codescore
-				cloudBrainInfo := getCloudBrainInfo(dateRecordAll, CloudBrainTaskItemMap, scoreMap)
-				playARoll := getPlayARoll(bonusMap, dateRecordAll.Name, scoreMap)
-				re := &UserSummaryCurrentYear{
-					ID:             dateRecordAll.ID,
-					Name:           dateRecordAll.Name,
-					Email:          dateRecordAll.Email,
-					Phone:          dateRecordAll.Phone,
-					RegistDate:     dateRecordAll.RegistDate,
-					DateCount:      int(subTime.Hours()) / 24,
-					MostActiveDay:  mostActiveDay,
-					RepoInfo:       repoInfo,
-					DataSetInfo:    dataSetInfo,
-					CodeInfo:       codeInfo,
-					CloudBrainInfo: cloudBrainInfo,
-					PlayARoll:      playARoll,
-				}
-				statictisSess.Insert(re)
-			}
 		}
 		if len(dateRecordBatch) > 0 {
 			err := insertTable(dateRecordBatch, tableName, statictisSess)
@@ -779,6 +748,127 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	log.Info("refresh data finished.tableName=" + tableName + " total record:" + fmt.Sprint(insertCount))
 }
 
+func RefreshUserYearTable(pageStartTime time.Time, pageEndTime time.Time) {
+	sess := x.NewSession()
+	defer sess.Close()
+	log.Info("RefreshUserYearTable start....")
+	statictisSess := xStatistic.NewSession()
+	defer statictisSess.Close()
+
+	log.Info("UserYear StartTime:" + pageStartTime.Format("2006-01-02 15:04:05"))
+	log.Info("UserYear EndTime time:" + pageEndTime.Format("2006-01-02 15:04:05"))
+
+	start_unix := pageStartTime.Unix()
+	end_unix := pageEndTime.Unix()
+
+	CodeMergeCountMap := queryPullRequest(start_unix, end_unix)
+	CommitCountMap, mostActiveMap := queryCommitAction(start_unix, end_unix, 5)
+	IssueCountMap := queryCreateIssue(start_unix, end_unix)
+
+	CommentCountMap := queryComment(start_unix, end_unix)
+
+	CommitCodeSizeMap, err := GetAllUserKPIStats(pageStartTime, pageEndTime)
+	if err != nil {
+		log.Info("query commit code errr.")
+	} else {
+		log.Info("query commit code size, len=" + fmt.Sprint(len(CommitCodeSizeMap)))
+	}
+	CommitDatasetSizeMap, CommitDatasetNumMap, dataSetDownloadMap := queryDatasetSize(start_unix, end_unix)
+	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
+	CreateRepoCountMap, DetailInfoMap, MostDownloadMap := queryUserCreateRepo(start_unix, end_unix)
+
+	CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix)
+
+	_, CollectedDataset := queryDatasetStars(start_unix, end_unix)
+	_, CreatedDataset := queryRecommedDataSet(start_unix, end_unix)
+
+	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))
+	if err != nil {
+		log.Info("query user error. return.")
+		return
+	}
+	var indexTotal int64
+	indexTotal = 0
+	for {
+		sess.Select("`user`.*").Table("user").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		userList := make([]*User, 0)
+		sess.Find(&userList)
+		for _, userRecord := range userList {
+			var dateRecordAll UserBusinessAnalysisAll
+			dateRecordAll.ID = userRecord.ID
+			dateRecordAll.Email = userRecord.Email
+			dateRecordAll.Phone = userRecord.PhoneNumber
+			dateRecordAll.RegistDate = userRecord.CreatedUnix
+			dateRecordAll.Name = userRecord.Name
+
+			dateRecordAll.CodeMergeCount = getMapValue(dateRecordAll.ID, CodeMergeCountMap)
+			dateRecordAll.CommitCount = getMapValue(dateRecordAll.ID, CommitCountMap)
+			dateRecordAll.IssueCount = getMapValue(dateRecordAll.ID, IssueCountMap)
+			dateRecordAll.CommentCount = getMapValue(dateRecordAll.ID, CommentCountMap)
+
+			if _, ok := CommitCodeSizeMap[dateRecordAll.Email]; !ok {
+				dateRecordAll.CommitCodeSize = 0
+			} else {
+				dateRecordAll.CommitCodeSize = int(CommitCodeSizeMap[dateRecordAll.Email].CommitLines)
+			}
+			//dateRecordAll.CommitCodeSize = getMapValue(dateRecordAll.ID, CommitCodeSizeMap)
+			dateRecordAll.CommitDatasetSize = getMapValue(dateRecordAll.ID, CommitDatasetSizeMap)
+			dateRecordAll.CommitDatasetNum = getMapValue(dateRecordAll.ID, CommitDatasetNumMap)
+			dateRecordAll.SolveIssueCount = getMapValue(dateRecordAll.ID, SolveIssueCountMap)
+			dateRecordAll.CreateRepoCount = getMapValue(dateRecordAll.ID, CreateRepoCountMap)
+
+			dateRecordAll.CloudBrainTaskNum = getMapValue(dateRecordAll.ID, CloudBrainTaskMap)
+			dateRecordAll.GpuDebugJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_GpuDebugJob", CloudBrainTaskItemMap)
+			dateRecordAll.NpuDebugJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_NpuDebugJob", CloudBrainTaskItemMap)
+			dateRecordAll.GpuTrainJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_GpuTrainJob", CloudBrainTaskItemMap)
+			dateRecordAll.NpuTrainJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_NpuTrainJob", CloudBrainTaskItemMap)
+			dateRecordAll.NpuInferenceJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_NpuInferenceJob", CloudBrainTaskItemMap)
+			dateRecordAll.GpuBenchMarkJob = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_GpuBenchMarkJob", CloudBrainTaskItemMap)
+			dateRecordAll.CloudBrainRunTime = getMapKeyStringValue(fmt.Sprint(dateRecordAll.ID)+"_CloudBrainRunTime", CloudBrainTaskItemMap)
+
+			//年度数据
+			subTime := time.Now().UTC().Sub(dateRecordAll.RegistDate.AsTime().UTC())
+			mostActiveDay := ""
+			if userInfo, ok := mostActiveMap[dateRecordAll.ID]; ok {
+				mostActiveDay = getMostActiveJson(userInfo)
+			}
+			scoreMap := make(map[string]float64)
+			repoInfo := getRepoDetailInfo(DetailInfoMap, dateRecordAll.ID, MostDownloadMap)
+			dataSetInfo, datasetscore := getDataSetInfo(dateRecordAll.ID, CreatedDataset, dataSetDownloadMap, CommitDatasetNumMap, CollectedDataset)
+			scoreMap["datasetscore"] = datasetscore
+			codeInfo, codescore := getCodeInfo(dateRecordAll)
+			scoreMap["codescore"] = codescore
+			cloudBrainInfo := getCloudBrainInfo(dateRecordAll, CloudBrainTaskItemMap, scoreMap)
+			playARoll := getPlayARoll(bonusMap, dateRecordAll.Name, scoreMap)
+			re := &UserSummaryCurrentYear{
+				ID:             dateRecordAll.ID,
+				Name:           dateRecordAll.Name,
+				Email:          dateRecordAll.Email,
+				Phone:          dateRecordAll.Phone,
+				RegistDate:     dateRecordAll.RegistDate,
+				DateCount:      int(subTime.Hours()) / 24,
+				MostActiveDay:  mostActiveDay,
+				RepoInfo:       repoInfo,
+				DataSetInfo:    dataSetInfo,
+				CodeInfo:       codeInfo,
+				CloudBrainInfo: cloudBrainInfo,
+				PlayARoll:      playARoll,
+			}
+			statictisSess.Insert(re)
+		}
+		indexTotal += PAGE_SIZE
+		if indexTotal >= count {
+			break
+		}
+	}
+	log.Info("update user year data finished. ")
+}
+
 func isUserYearData(tableName string) bool {
 	if tableName == "user_business_analysis_current_year" {
 		currentTimeNow := time.Now()
@@ -998,7 +1088,7 @@ func insertTable(dateRecords []UserBusinessAnalysisAll, tableName string, static
 
 	insertBatchSql := "INSERT INTO public." + tableName +
 		"(id, count_date, code_merge_count, commit_count, issue_count, comment_count, focus_repo_count, star_repo_count, watched_count, gitea_age_month, commit_code_size, commit_dataset_size, " +
-		"commit_model_count, solve_issue_count, encyclopedias_count, regist_date, create_repo_count, login_count, open_i_index, email, name, data_date,cloud_brain_task_num,gpu_debug_job,npu_debug_job,gpu_train_job,npu_train_job,npu_inference_job,gpu_bench_mark_job,cloud_brain_run_time,commit_dataset_num,user_index,user_location,focus_other_user,collect_dataset,collected_dataset,recommend_dataset,collect_image,collected_image,recommend_image,user_index_primitive,phone,invitation_user_num) " +
+		"commit_model_count, solve_issue_count, encyclopedias_count, regist_date, create_repo_count, login_count, open_i_index, email, name, data_date,cloud_brain_task_num,gpu_debug_job,npu_debug_job,gpu_train_job,npu_train_job,npu_inference_job,gpu_bench_mark_job,cloud_brain_run_time,commit_dataset_num,user_index,user_location,focus_other_user,collect_dataset,collected_dataset,recommend_dataset,collect_image,collected_image,recommend_image,user_index_primitive,phone,invitation_user_num,model_convert_count) " +
 		"VALUES"
 
 	for i, record := range dateRecords {
@@ -1007,7 +1097,7 @@ func insertTable(dateRecords []UserBusinessAnalysisAll, tableName string, static
 			", " + fmt.Sprint(record.WatchedCount) + ", " + fmt.Sprint(record.GiteaAgeMonth) + ", " + fmt.Sprint(record.CommitCodeSize) + ", " + fmt.Sprint(record.CommitDatasetSize) +
 			", " + fmt.Sprint(record.CommitModelCount) + ", " + fmt.Sprint(record.SolveIssueCount) + ", " + fmt.Sprint(record.EncyclopediasCount) + ", " + fmt.Sprint(record.RegistDate) +
 			", " + fmt.Sprint(record.CreateRepoCount) + ", " + fmt.Sprint(record.LoginCount) + ", " + fmt.Sprint(record.OpenIIndex) + ", '" + record.Email + "', '" + record.Name + "', '" + record.DataDate + "'," + fmt.Sprint(record.CloudBrainTaskNum) + "," + fmt.Sprint(record.GpuDebugJob) + "," + fmt.Sprint(record.NpuDebugJob) + "," + fmt.Sprint(record.GpuTrainJob) + "," + fmt.Sprint(record.NpuTrainJob) + "," + fmt.Sprint(record.NpuInferenceJob) + "," + fmt.Sprint(record.GpuBenchMarkJob) + "," + fmt.Sprint(record.CloudBrainRunTime) + "," + fmt.Sprint(record.CommitDatasetNum) + "," + fmt.Sprint(record.UserIndex) + ",'" + record.UserLocation + "'," +
-			fmt.Sprint(record.FocusOtherUser) + "," + fmt.Sprint(record.CollectDataset) + "," + fmt.Sprint(record.CollectedDataset) + "," + fmt.Sprint(record.RecommendDataset) + "," + fmt.Sprint(record.CollectImage) + "," + fmt.Sprint(record.CollectedImage) + "," + fmt.Sprint(record.RecommendImage) + "," + fmt.Sprint(record.UserIndexPrimitive) + ",'" + record.Phone + "'" + "," + fmt.Sprint(record.InvitationUserNum) + ")"
+			fmt.Sprint(record.FocusOtherUser) + "," + fmt.Sprint(record.CollectDataset) + "," + fmt.Sprint(record.CollectedDataset) + "," + fmt.Sprint(record.RecommendDataset) + "," + fmt.Sprint(record.CollectImage) + "," + fmt.Sprint(record.CollectedImage) + "," + fmt.Sprint(record.RecommendImage) + "," + fmt.Sprint(record.UserIndexPrimitive) + ",'" + record.Phone + "'" + "," + fmt.Sprint(record.InvitationUserNum) + "," + fmt.Sprint(record.ModelConvertCount) + ")"
 		if i < (len(dateRecords) - 1) {
 			insertBatchSql += ","
 		}
@@ -1098,6 +1188,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 	OpenIIndexMap := queryUserRepoOpenIIndex(start_unix, end_unix)
 	CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix)
 	AiModelManageMap := queryUserModel(start_unix, end_unix)
+	AiModelConvertMap := queryUserModelConvert(start_unix, end_unix)
 
 	CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix)
 	RecommendDataset, _ := queryRecommedDataSet(start_unix, end_unix)
@@ -1179,7 +1270,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 			dateRecord.GpuBenchMarkJob = getMapKeyStringValue(fmt.Sprint(dateRecord.ID)+"_GpuBenchMarkJob", CloudBrainTaskItemMap)
 			dateRecord.CloudBrainRunTime = getMapKeyStringValue(fmt.Sprint(dateRecord.ID)+"_CloudBrainRunTime", CloudBrainTaskItemMap)
 			dateRecord.CommitModelCount = getMapValue(dateRecord.ID, AiModelManageMap)
-
+			dateRecord.ModelConvertCount = getMapValue(dateRecord.ID, AiModelConvertMap)
 			dateRecord.CollectDataset = getMapValue(dateRecord.ID, CollectDataset)
 			dateRecord.CollectedDataset = getMapValue(dateRecord.ID, CollectedDataset)
 			dateRecord.RecommendDataset = getMapValue(dateRecord.ID, RecommendDataset)
@@ -1368,6 +1459,7 @@ func getUserIndexFromAnalysisAll(dateRecord UserBusinessAnalysisAll, ParaWeight
 	result += float64(dateRecord.CreateRepoCount) * getParaWeightValue("CreateRepoCount", ParaWeight, 0.05)
 	result += float64(dateRecord.CloudBrainTaskNum) * getParaWeightValue("CloudBrainTaskNum", ParaWeight, 0.3)
 	result += float64(dateRecord.CommitModelCount) * getParaWeightValue("CommitModelCount", ParaWeight, 0.2)
+	result += float64(dateRecord.ModelConvertCount) * getParaWeightValue("ModelConvertCount", ParaWeight, 0.2)
 	result += dateRecord.OpenIIndex * getParaWeightValue("OpenIIndex", ParaWeight, 0.1)
 
 	result += float64(dateRecord.CollectDataset) * getParaWeightValue("CollectDataset", ParaWeight, 0.1)
@@ -1393,6 +1485,7 @@ func getUserActivateAll(dateRecord UserBusinessAnalysisAll) int {
 	result += dateRecord.CreateRepoCount
 	result += dateRecord.CloudBrainTaskNum
 	result += dateRecord.CommitModelCount
+	result += dateRecord.ModelConvertCount
 	result += dateRecord.CommitDatasetNum
 	result += dateRecord.FocusOtherUser
 	result += dateRecord.CollectDataset
@@ -1414,6 +1507,7 @@ func getUserActivate(dateRecord UserBusinessAnalysis) int {
 	result += dateRecord.CreateRepoCount
 	result += dateRecord.CloudBrainTaskNum
 	result += dateRecord.CommitModelCount
+	result += dateRecord.ModelConvertCount
 	result += dateRecord.CommitDatasetNum
 	result += dateRecord.FocusOtherUser
 	result += dateRecord.CollectDataset
@@ -1450,6 +1544,7 @@ func getUserIndex(dateRecord UserBusinessAnalysis, ParaWeight map[string]float64
 	result += float64(dateRecord.CreateRepoCount) * getParaWeightValue("CreateRepoCount", ParaWeight, 0.05)
 	result += float64(dateRecord.CloudBrainTaskNum) * getParaWeightValue("CloudBrainTaskNum", ParaWeight, 0.3)
 	result += float64(dateRecord.CommitModelCount) * getParaWeightValue("CommitModelCount", ParaWeight, 0.2)
+	result += float64(dateRecord.ModelConvertCount) * getParaWeightValue("ModelConvertCount", ParaWeight, 0.2)
 	result += dateRecord.OpenIIndex * getParaWeightValue("OpenIIndex", ParaWeight, 0.1)
 
 	result += float64(dateRecord.CollectDataset) * getParaWeightValue("CollectDataset", ParaWeight, 0.1)
@@ -1494,10 +1589,6 @@ func getInt(str string) int {
 	return int(re)
 }
 
-func CounDataByDate(wikiCountMap map[string]int, startTime time.Time, endTime time.Time) {
-	CounDataByDateAndReCount(wikiCountMap, startTime, endTime, false)
-}
-
 func querySolveIssue(start_unix int64, end_unix int64) map[int64]int {
 	sess := x.NewSession()
 	defer sess.Close()
@@ -2278,6 +2369,38 @@ func queryUserModel(start_unix int64, end_unix int64) map[int64]int {
 	return resultMap
 }
 
+func queryUserModelConvert(start_unix int64, end_unix int64) map[int64]int {
+	sess := x.NewSession()
+	defer sess.Close()
+	resultMap := make(map[int64]int)
+	cond := " created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix)
+	count, err := sess.Where(cond).Count(new(AiModelConvert))
+	if err != nil {
+		log.Info("query AiModelConvert error. return.")
+		return resultMap
+	}
+	var indexTotal int64
+	indexTotal = 0
+	for {
+		sess.Select("id,user_id").Table("ai_model_convert").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		aiModelList := make([]*AiModelConvert, 0)
+		sess.Find(&aiModelList)
+		log.Info("query AiModelConvert size=" + fmt.Sprint(len(aiModelList)))
+		for _, aiModelRecord := range aiModelList {
+			if _, ok := resultMap[aiModelRecord.UserId]; !ok {
+				resultMap[aiModelRecord.UserId] = 1
+			} else {
+				resultMap[aiModelRecord.UserId] += 1
+			}
+		}
+		indexTotal += PAGE_SIZE
+		if indexTotal >= count {
+			break
+		}
+	}
+	return resultMap
+}
+
 func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[string]int) {
 	sess := x.NewSession()
 	defer sess.Close()

models/user_business_struct.go

@@ -89,6 +89,7 @@ type UserBusinessAnalysisCurrentYear struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }
 
 type UserBusinessAnalysisLast30Day struct {
@@ -157,6 +158,7 @@ type UserBusinessAnalysisLast30Day struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }
 
 type UserBusinessAnalysisLastMonth struct {
@@ -225,6 +227,7 @@ type UserBusinessAnalysisLastMonth struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }
 
 type UserBusinessAnalysisCurrentMonth struct {
@@ -293,6 +296,7 @@ type UserBusinessAnalysisCurrentMonth struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }
 
 type UserBusinessAnalysisCurrentWeek struct {
@@ -362,6 +366,7 @@ type UserBusinessAnalysisCurrentWeek struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }
 
 type UserBusinessAnalysisYesterday struct {
@@ -431,6 +436,7 @@ type UserBusinessAnalysisYesterday struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }
 
 type UserBusinessAnalysisLastWeek struct {
@@ -500,6 +506,7 @@ type UserBusinessAnalysisLastWeek struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }
 
 type UserAnalysisPara struct {
@@ -616,6 +623,7 @@ type UserBusinessAnalysisAll struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }
 
 type UserBusinessAnalysis struct {
@@ -704,4 +712,5 @@ type UserBusinessAnalysis struct {
 
 	Phone             string `xorm:"NULL"`
 	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+	ModelConvertCount int    `xorm:"NOT NULL DEFAULT 0"`
 }

routers/repo/user_data_analysis.go

@@ -21,6 +21,7 @@ import (
 const (
 	PAGE_SIZE       = 2000
 	Excel_File_Path = "/useranalysis/"
+	USER_YEAR       = 2022
 )
 
 func getUserMetricsExcelHeader(ctx *context.Context) map[string]string {
@@ -104,6 +105,7 @@ func getExcelHeader(ctx *context.Context) map[string]string {
 	excelHeader = append(excelHeader, ctx.Tr("user.static.CloudBrainRunTime"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.CommitDatasetNum"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.CommitModelCount"))
+	excelHeader = append(excelHeader, ctx.Tr("user.static.ModelConvertCount"))
 
 	excelHeader = append(excelHeader, ctx.Tr("user.static.FocusOtherUser"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.CollectDataset"))
@@ -178,6 +180,8 @@ func writeExcel(row int, xlsx *excelize.File, sheetName string, userRecord *mode
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.CommitModelCount)
 	tmp = tmp + 1
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.ModelConvertCount)
+	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.FocusOtherUser)
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.CollectDataset)
@@ -256,6 +260,8 @@ func writeExcelPage(row int, xlsx *excelize.File, sheetName string, userRecord *
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.CommitModelCount)
 	tmp = tmp + 1
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.ModelConvertCount)
+	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.FocusOtherUser)
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.CollectDataset)
@@ -714,6 +720,12 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) {
 	log.Info("startTime time:" + startTime.Format("2006-01-02 15:04:05"))
 	log.Info("endTime time:" + endTime.Format("2006-01-02 15:04:05"))
 	warnEmailMessage := "用户统计信息入库失败，请尽快定位。"
+
+	startYear := time.Date(USER_YEAR, 1, 1, 0, 0, 0, 1, t.Location())
+	endYear := startYear.AddDate(1, 0, 0)
+
+	models.RefreshUserYearTable(startYear, endYear)
+
 	//query wiki data
 	log.Info("start to time count data")
 	wikiMap, err := queryWikiCountMap(startTime, endTime)